---
filter/source/svg/svgwriter.hxx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index dd033a2..0b6048e 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -29,13 +29,13 @@
#ifndef SVGWRITER_HXX
#define SVGWRITER_HXX
+#include <stack>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#include <tools/stack.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
@@ -164,7 +164,7 @@ private:
sal_Int32 mnCurGradientId;
sal_Int32 mnCurMaskId;
sal_Int32 mnCurPatternId;
- Stack maContextStack;
+ ::std::stack< SVGAttributeWriter* > maContextStack;
::std::auto_ptr< SVGShapeDescriptor > mapCurShape;
SVGExport& mrExport;
SVGFontExport& mrFontExport;
@@ -179,8 +179,17 @@ private:
sal_Bool mbIsPlacehlolderShape;
- SVGAttributeWriter* ImplAcquireContext() { maContextStack.Push( mpContext = new
SVGAttributeWriter( mrExport, mrFontExport ) ); return mpContext; }
- void ImplReleaseContext() { delete (SVGAttributeWriter*)
maContextStack.Pop(); mpContext = (SVGAttributeWriter*) maContextStack.Top(); }
+ SVGAttributeWriter* ImplAcquireContext()
+ {
+ maContextStack.push( mpContext = new SVGAttributeWriter( mrExport, mrFontExport ) );
+ return mpContext;
+ }
+ void ImplReleaseContext()
+ {
+ delete maContextStack.top();
+ maContextStack.pop();
+ mpContext = maContextStack.top();
+ }
long ImplMap( sal_Int32 nVal ) const;
Point& ImplMap( const Point& rPt, Point& rDstPt ) const;
Context
- [Libreoffice] [PATCH 08/11] Replace Stack with std::stack< SVGAttributeWriter* > · Marcel Metz
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.