Merge commit 'ooo/OOO330_m17' into libreoffice-3-3

1 files changed, 8 insertions, 4 deletions

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 5a6caae1dd..10ddadc529 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -249,9 +249,12 @@ namespace
             if(nPushFlags)
             {
                 OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: PUSH with no property holders (!)");
-                PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
-                pNew->setPushFlags(nPushFlags);
-                maPropertyHolders.push_back(pNew);
+                if ( !maPropertyHolders.empty() )
+                {
+                    PropertyHolder* pNew = new PropertyHolder(*maPropertyHolders.back());
+                    pNew->setPushFlags(nPushFlags);
+                    maPropertyHolders.push_back(pNew);
+                }
             }
         }
 
@@ -355,8 +358,9 @@ namespace
 
         PropertyHolder& Current()
         {
+            static PropertyHolder aDummy;
             OSL_ENSURE(maPropertyHolders.size(), "PropertyHolders: CURRENT with no property holders (!)");
-            return *maPropertyHolders.back();
+            return maPropertyHolders.empty() ? aDummy : *maPropertyHolders.back();
         }
 
         ~PropertyHolders()