From 1d93737ff8a4ad7ddee057cb6a30286bf4e6ff6b Mon Sep 17 00:00:00 2001
From: sj <sj@openoffice.org>
Date: Mon, 22 Nov 2010 18:56:17 +0100
Subject: os145: #b7001888# fixing small svm problem

---
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'drawinglayer')

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 0d57e566ef8a..73683884e2bd 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -248,9 +248,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);
+                }
             }
         }
 
@@ -354,8 +357,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()
-- 
cgit 


From 492a60385295d6b11d8c40634e2764c30cf12320 Mon Sep 17 00:00:00 2001
From: sj <sj@openoffice.org>
Date: Thu, 2 Dec 2010 14:31:22 +0100
Subject: impress205: #i115825# fixed metatextarray issues

---
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drawinglayer')

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 73683884e2bd..893c572a3086 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2017,7 +2017,7 @@ namespace
 
                     if(nTextLength + nTextIndex > nStringLength)
                     {
-                        nTextLength = nStringLength - nTextIndex;
+                        nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
                     }
 
                     if(nTextLength && rPropertyHolders.Current().getTextColorActive())
-- 
cgit