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

INTEGRATION: CWS impress46 (1.43.64); FILE MERGED

Browse source 
2005/04/07 15:51:37 af 1.43.64.1: #i46832# Using proper default values for layouts when creating new slides.
This commit is contained in:
Oliver Bolte 2005-04-18 10:17:48 +00:00
parent e7aa0a07ec
commit c47e951da2
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sd/source/ui/view/viewshe3.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewshe3.cxx,v $
*
* $Revision: 1.43 $
* $Revision: 1.44 $
*
* last change: $Author: vg $ $Date: 2005-02-16 17:04:05 $
* last change: $Author: obo $ $Date: 2005-04-18 11:17:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1201,8 +1201,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
String aStandardPageName;
String aNotesPageName;
AutoLayout eStandardLayout;
AutoLayout eNotesLayout;
AutoLayout eStandardLayout (AUTOLAYOUT_NONE);
AutoLayout eNotesLayout (AUTOLAYOUT_NOTES);
BOOL bIsPageBack = aVisibleLayers.IsSet(aBckgrnd);
BOOL bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj);
@ -1223,6 +1223,15 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// AutoLayouts muessen fertig sein
pDocument->StopWorkStartupDelay();
// Use the layouts of the previous page and notes page as template.
if (pTemplatePage != NULL)
{
eStandardLayout = pTemplatePage->GetAutoLayout();
SdPage* pNotesTemplatePage = static_cast<SdPage*>(pDocument->GetPage(pTemplatePage->GetPageNum()+1));
if (pNotesTemplatePage != NULL)
eNotesLayout = pNotesTemplatePage->GetAutoLayout();
}
}
else if (pArgs->Count () != 4)
{