CWS-TOOLING: integrate CWS aw079

This commit is contained in:
Vladimir Glazunov 2010-03-22 14:39:41 +01:00
commit 8f9d835322

View file

@ -3127,10 +3127,12 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
}
if ( rSlidePersist.pBObj )
{
if ( rSlidePersist.bBObjIsTemporary )
SdrObject::Free( rSlidePersist.pBObj );
else
pRet->SetBackgroundObj( rSlidePersist.pBObj );
// #i99386# transfer the attributes from the temporary BackgroundObject
// to the Page and delete it. Maybe rSlidePersist.bBObjIsTemporary is
// obsolete here, too.
pRet->getSdrPageProperties().ClearItem();
pRet->getSdrPageProperties().PutItemSet(rSlidePersist.pBObj->GetMergedItemSet());
SdrObject::Free( rSlidePersist.pBObj );
}
}
}