diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:44:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 12:44:24 +0000 |
| commit | d672eda7fcd2769fbee68f3db32ca4d5a4db7094 (patch) | |
| tree | bf5de5a22cd007ebb4859a764ac6c22d6868d02e /sd/source/ui/view/drviews3.cxx | |
| parent | INTEGRATION: CWS impress11 (1.7.28); FILE MERGED (diff) | |
| download | core-d672eda7fcd2769fbee68f3db32ca4d5a4db7094.tar.gz core-d672eda7fcd2769fbee68f3db32ca4d5a4db7094.zip | |
INTEGRATION: CWS impress11 (1.27.30); FILE MERGED
2004/08/06 10:10:09 af 1.27.30.2: #i32098# Give the master page to the dialog when in master page mode.
2004/08/05 16:58:25 af 1.27.30.1: #i32098# Replaced SID_MASTER_LAYOUTS_... by single SID_MASTER_LAYOUTS.
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 912927ddf73e..244f1c9ea366 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviews3.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: rt $ $Date: 2004-07-13 14:54:52 $ + * last change: $Author: hr $ $Date: 2004-09-08 13:44:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -191,6 +191,7 @@ #endif #include "LayerTabBar.hxx" #include "sdabstdlg.hxx" //CHINA001 +#include "sdpage.hxx" namespace sd { @@ -402,6 +403,24 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) break; } + case SID_MASTER_LAYOUTS: + { + SdPage* pPage = GetActualPage(); + if (eEditMode == EM_MASTERPAGE) + // Use the master page of the current page. + pPage = static_cast<SdPage*>(&pPage->TRG_GetMasterPage()); + + SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 + DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 + VclAbstractDialog* pDlg = pFact->CreateMasterLayoutDialog( GetActiveWindow(), GetDoc(), pPage ); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + pDlg->Execute(); + delete pDlg; + Invalidate(); + rReq.Done (); + break; + } + /* case SID_MASTER_LAYOUTS_SLIDE: { SdPage* pPage = pActualPage; @@ -462,7 +481,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) rReq.Done (); break; } - + */ case SID_OBJECTRESIZE: { /****************************************************************** |