implemented BeginContainerNoParams and EndContainer records

 - plus a bit of refactoring to reuse code

Change-Id: I416d2c47800752a27e2dc79f9b55b096e641062f

1 files changed, 6 insertions, 2 deletions

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 453736825e9b..addcdc2f15b1 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -174,6 +174,8 @@ static float GetSwapFloat( SvStream& rSt )
             OutDevState aDevState;
         } EmfPlusGraphicState;
 
+        typedef ::std::map<int,EmfPlusGraphicState> GraphicStateMap;
+
         class ImplRenderer : public virtual Renderer, protected CanvasGraphicHelper
         {
         public:
@@ -215,6 +217,8 @@ static float GetSwapFloat( SvStream& rSt )
             void MapToDevice (double &x, double &y);
             ::basegfx::B2DPoint Map (double ix, double iy);
             ::basegfx::B2DSize MapSize (double iwidth, double iheight);
+            void GraphicStatePush (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
+            void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
 
         private:
             // default: disabled copy/assignment
@@ -300,8 +304,8 @@ static float GetSwapFloat( SvStream& rSt )
             sal_uInt16      mMFlags;
             SvMemoryStream  mMStream;
             /* emf+ graphic state stack */
-            ::std::map<int,EmfPlusGraphicState> mGSStack;
-            typedef ::std::map<int,EmfPlusGraphicState>::iterator EPGSSIter;
+            GraphicStateMap mGSStack;
+            GraphicStateMap mGSContainerStack;
         };