diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-14 10:26:31 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-14 10:26:31 +0200 |
| commit | ab76732221aaf59cc9df43fa99b1883cb7888049 (patch) | |
| tree | 6a04831c10ea5f40a25db75f97ec25a7833dcd59 /sd/source/ui/toolpanel | |
| parent | 8a9c809426226f9c634d8b58392920fbcd917f7e (diff) | |
| parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
cws tl74: merge with DEV300 m76
Diffstat (limited to 'sd/source/ui/toolpanel')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 0c485afed3d2..2e121098194a 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "stlpool.hxx" - +#include <svx/xfillit0.hxx> using namespace ::com::sun::star; namespace sd { namespace toolpanel { namespace controls { @@ -446,9 +446,10 @@ void DocumentHelper::AssignMasterPageToPage ( // not override the new master page) and assign the master page to // the regular slide. pDocument->GetDocSh()->GetUndoManager()->AddUndoAction( - new SdBackgroundObjUndoAction(*pDocument, *pPage, pPage->GetBackgroundObj()), - TRUE); - pPage->SetBackgroundObj(NULL); + new SdBackgroundObjUndoAction( + *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()), + TRUE); + pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); pDocument->SetMasterPage ( (pPage->GetPageNum()-1)/2, |