diff options
| author | Marcel Metz <mmetz@adrian-broher.net> | 2011-12-05 19:08:38 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2011-12-05 22:54:55 +0100 |
| commit | b3ba4376c6f5e63aeeadec95c51bcd164d10f2b5 (patch) | |
| tree | b810a25acd60f308b273eaf4a9ed2edf04abbee9 | |
| parent | 49ac37ddfcd39eef947d4d4d5805e89bfa4ca063 (diff) | |
Replace Stack with std::stack< SVGAttributeWriter* >
| -rw-r--r-- | 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 dd033a2bb3cc..0b6048e7fb18 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; |