strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impress11 (1.27.30); FILE MERGED

Browse source 
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.
This commit is contained in:
Jens-Heiner Rechtien 2004-09-08 12:44:24 +00:00
parent 4da66400a8
commit d672eda7fc
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sd/source/ui/view/drviews3.cxx
View file

@ -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:
{
/******************************************************************