diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-18 10:17:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-18 10:17:48 +0000 |
| commit | c47e951da2058c6bd96e056317f9c5076898e3ae (patch) | |
| tree | 5f407715800a30a88580469527e73ad5fe7cd5bd /sd/source/ui | |
| parent | e7aa0a07ec834eba0f5f3dfe38168e9b228aa7d7 (diff) | |
INTEGRATION: CWS impress46 (1.43.64); FILE MERGED
2005/04/07 15:51:37 af 1.43.64.1: #i46832# Using proper default values for layouts when creating new slides.
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 216e3443602a..ee6015a41770 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -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) { |