diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | f0b556722d70317842b9e297271e7165594dd2cc (patch) | |
| tree | f888dfa3ad24e6ea9a65bb44eb74dfdbd3064299 /sd/source/ui/view/viewshe3.cxx | |
| parent | 8b52ada25a24b70b229b026f9f2928326d17443e (diff) | |
| parent | cc4fb231342cc7ad2f213a18c940248c436ee0e2 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
| -rw-r--r--[-rwxr-xr-x] | sd/source/ui/view/viewshe3.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 4d8986952989..363ff91edf36 100755..100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -216,7 +216,8 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* ViewShell::CreateOrDuplicatePage ( SfxRequest& rRequest, PageKind ePageKind, - SdPage* pPage) + SdPage* pPage, + const sal_Int32 nInsertPosition) { USHORT nSId = rRequest.GetSlot(); SdDrawDocument* pDocument = GetDoc(); @@ -255,7 +256,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW) { framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel( - framework::FrameworkHelper::msLayoutTaskPanelURL); + framework::FrameworkHelper::msLayoutTaskPanelURL, + false); } */ @@ -377,7 +379,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + bIsPageObj, + nInsertPosition); // Select exactly the new page. USHORT nPageCount (pDocument->GetSdPageCount(ePageKind)); for (USHORT i=0; i<nPageCount; i++) @@ -400,7 +403,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + bIsPageObj, + nInsertPosition); break; case SID_DUPLICATE_PAGE: @@ -414,7 +418,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( eStandardLayout, eNotesLayout, bIsPageBack, - bIsPageObj); + bIsPageObj, + nInsertPosition); break; default: |