strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS os145

Browse source
This commit is contained in:
Kurt Zenker 2010-11-23 16:56:24 +01:00
commit 12c1007715
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drawinglayer/source/primitive2d/metafileprimitive2d.cxx
View file

@ -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()