diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-11-23 16:56:24 +0100 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-11-23 16:56:24 +0100 |
commit | 79df60d709cade49cbd73550ea08d33a07395e99 (patch) | |
tree | 59de92fa3d54b97750d97de2842c6fd04a1d383c | |
parent | 74112b4eb8953e419446aece91e2a99c1774e147 (diff) | |
parent | 3c0fad2e49ba3de613eb1ad70dd6144dcda859aa (diff) |
CWS-TOOLING: integrate CWS os145
-rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 269c5cfe06..6b1931d905 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() |