diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-02-10 12:07:19 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2010-02-10 12:07:19 +0100 |
| commit | 8f07203d35afdeeebd485ccf6c23d09fdf451909 (patch) | |
| tree | 6c1ef5afa333327c7f2e90c5e32f2d31894b822e /filter | |
| parent | 61e959dac551c5984e9865edea9f2ad7203233fd (diff) | |
aw079 #i99386# corrected SetBackgroundObj in filter implementation
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 2d16541aa59a..23a6eee66aeb 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3129,10 +3129,19 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* } if ( rSlidePersist.pBObj ) { +#ifdef NEWPBG + // #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 ); +#else if ( rSlidePersist.bBObjIsTemporary ) SdrObject::Free( rSlidePersist.pBObj ); else pRet->SetBackgroundObj( rSlidePersist.pBObj ); +#endif } } } |