diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 12:33:51 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 12:33:51 +0000 |
| commit | 0fe0589756c8ad51f434bfb89affbf05aa532017 (patch) | |
| tree | 454a649d7fa92645889da3e2e6b79bb8c7a28b23 /sd/source/ui/view/ViewShellImplementation.cxx | |
| parent | 85fb884cace22cd74289aff7aeb55314e477b44c (diff) | |
INTEGRATION: CWS impress20ea (1.4.28); FILE MERGED
2004/10/12 09:29:17 af 1.4.28.3: #i34881# Added mbIsInitialized member.
2004/09/16 16:04:36 af 1.4.28.2: #i34011# Fixed handling of layers for master pages.
2004/09/15 08:00:54 af 1.4.28.1: #i34011# In ProcessModifyPageSlot() extract the visible layers only for non-master pages.
Diffstat (limited to 'sd/source/ui/view/ViewShellImplementation.cxx')
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 127bb80be5e0..a4c3249fb56f 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ViewShellImplementation.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-08-04 09:00:53 $ + * last change: $Author: pjunck $ $Date: 2004-10-28 13:33:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,6 +87,7 @@ #include <vcl/msgbox.hxx> #include <basic/sbstar.hxx> + namespace { class ImpUndoDeleteWarning : public ModalDialog { @@ -133,7 +134,8 @@ namespace sd { ViewShell::Implementation::Implementation (ViewShell& rViewShell) : mbIsShowingUIControls(false), mbIsMainViewShell(false), - mrViewShell (rViewShell) + mrViewShell (rViewShell), + mbIsInitialized(false) { } @@ -158,7 +160,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); - SetOfByte aVisibleLayers = pCurrentPage->TRG_GetMasterPageVisibleLayers(); + SetOfByte aVisibleLayers; BOOL bHandoutMode = FALSE; SdPage* pHandoutMPage = NULL; String aNewName; @@ -175,6 +177,11 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( BOOL bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); + if (pCurrentPage->TRG_HasMasterPage()) + aVisibleLayers = pCurrentPage->TRG_GetMasterPageVisibleLayers(); + else + aVisibleLayers.SetAll(); + do { if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 ) @@ -421,4 +428,5 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( rRequest.Done (); } + } // end of namespace sd |