summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@Sun.COM>2010-02-11 17:35:16 +0100
committerArmin Le Grand <Armin.Le.Grand@Sun.COM>2010-02-11 17:35:16 +0100
commita9626fc825840c49fd3135fbf4818e276cd347cb (patch)
tree989109ecba1c8fdcc58b22974fa011cab299aca3
parenta4d83adbf01e4d8f935ad2ded82be80d13b7cdb1 (diff)
aw079 #i99386# cleanup of define and last change from CL
-rw-r--r--filter/source/msfilter/svdfppt.cxx7
1 files changed, 0 insertions, 7 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 23a6eee66aeb..97cdd607fae3 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3129,19 +3129,12 @@ 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
}
}
}