diff options
| author | Christian Lippka <cl@openoffice.org> | 2010-04-16 13:50:13 +0200 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2010-04-16 13:50:13 +0200 |
| commit | 9bc155a7dcccafea620fce64cc02f3f052e16d09 (patch) | |
| tree | 498a61015a2bf3e7376c283086bec878af8c0267 | |
| parent | df66a0ddc600f4cb495d074067dd0184a141054f (diff) | |
#i109210# when in master page mode, only change background of current master page and not all (regression from last applied patch)
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 48c9f872ebb7..9fb0007cc72c 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -360,6 +360,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) ) mbPageBckgrdDeleted = TRUE; + bool bSetToAllPages = false; + // Ask, wether the setting are for the background-page or for the current page if( !mbMasterPage && bChanges ) { @@ -375,7 +377,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aTit, aTxt ); aQuestionBox.SetImage( QueryBox::GetStandardImage() ); - mbMasterPage = ( RET_YES == aQuestionBox.Execute() ); + bSetToAllPages = ( RET_YES == aQuestionBox.Execute() ); } if( mbPageBckgrdDeleted ) @@ -399,12 +401,13 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( mbMasterPage ) { -/* StyleSheetUndoAction* pAction = new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyleSheet, &(*pTempSet.get())); mpDocSh->GetUndoManager()->AddUndoAction(pAction); pStyleSheet->GetItemSet().Put( *(pTempSet.get()) ); pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); -*/ + } + else if( bSetToAllPages ) + { String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT)); SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager(); pUndoMgr->EnterListAction(aComment, aComment); |