[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - drawinglayer/source editeng/source

[René Engelhard]

 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |   12 ++++++++----
 editeng/source/misc/svxacorr.cxx                        |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 84a939e443d0d90eefffa75921d3c921e0bf9c42
Merge: 6e07792... 2a0abc9...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 26 17:41:54 2010 +0100

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

commit 2a0abc9acfea536ef68ab2083e6f57aaa9e860d0
Author: obo <obo at openoffice.org>
Date:   Thu Nov 25 11:51:51 2010 +0100

    masterfix OOO330: #i115774# crash in FR version when typing / as first character

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8eea009..672223a 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -701,7 +701,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
                     bRunNext = true;
             }
         }
-        else if ( cChar == '/' )
+        else if ( cChar == '/' && nEndPos > 1 && rTxt.Len() > (nEndPos - 1) )
         {
             // Remove the hardspace right before to avoid formatting URLs
             sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
commit 79df60d709cade49cbd73550ea08d33a07395e99
Merge: 74112b4... 3c0fad2...
Author: Kurt Zenker <kz at openoffice.org>
Date:   Tue Nov 23 16:56:24 2010 +0100

    CWS-TOOLING: integrate CWS os145

commit 3c0fad2e49ba3de613eb1ad70dd6144dcda859aa
Author: sj <sj at openoffice.org>
Date:   Mon Nov 22 18:56:17 2010 +0100

    os145: #b7001888# fixing small svm problem

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 269c5cf..6b1931d 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()