diff options
| author | Andre Fischer <af@apache.org> | 2013-06-05 15:40:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-20 16:35:29 +0100 |
| commit | 50cbbc7f3afdd077e98f416f97390fe93428e8cf (patch) | |
| tree | f1f0bdfa883202bd8fe382f8f99afda454c3e30e /sd/source/ui/app/sdmod1.cxx | |
| parent | d023339c2f85555212bdb9804854dcc2c403b50e (diff) | |
Resolves: #i122470# Fixed programmatic triggered switching of sidebar decks
(cherry picked from commit 7b26aba94e5544937f1e37e34915bcb276bc3c27)
Conflicts:
sd/sdi/sdraw.sdi
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/inc/framework/FrameworkHelper.hxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drviews6.cxx
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/Sidebar.hxx
Change-Id: Ic6b518e734fe59a7b713e85e934487347b847c5a
Diffstat (limited to 'sd/source/ui/app/sdmod1.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 361124f3c590..ef5915997be5 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -538,7 +538,6 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( pFrmItem ) xTargetFrame = pFrmItem->GetFrame(); - bool bMakeLayoutVisible = false; SfxViewFrame* pViewFrame = NULL; SdOptions* pOpt = GetSdOptions(DOCUMENT_TYPE_IMPRESS); @@ -562,7 +561,6 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) { //create an empty document pFrame = CreateEmptyDocument( DOCUMENT_TYPE_IMPRESS, xTargetFrame ); - bMakeLayoutVisible = true; } } else @@ -714,25 +712,12 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) // clear UNDO stack after autopilot pDocShell->ClearUndoBuffer(); - - bMakeLayoutVisible = true; } } pOpt->SetStartWithTemplate(bStartWithTemplate); } } } - - if (bMakeLayoutVisible && pViewFrame!=NULL) - { - // Make the layout menu visible in the tool pane. - ::sd::ViewShellBase* pBase = ::sd::ViewShellBase::GetViewShellBase(pViewFrame); - if (pBase != NULL) - { - FrameworkHelper::Instance(*pBase)->RequestSidebarPanel( - FrameworkHelper::msLayoutTaskPanelURL); - } - } } return pFrame; |