diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-05 11:48:17 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-07 15:00:32 +0100 |
| commit | ee1726bfdba483623d496a3bcc09089e8b55cd65 (patch) | |
| tree | d53cb5317b9c311c3bd8c745f8cdcc82f3b851c8 /sd | |
| parent | abdbb847fa135dd758ef3ef99db4c07a2671ca47 (diff) | |
sidebar: disable impress task pane if sidebar is enabled.
Change-Id: I64e601dfd6f4a3763188537f9507c536b86b70fe
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sddll2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/PaneChildWindows.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/inc/PaneChildWindows.hxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index 78c78ea26b17..a945bfbd99a1 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -126,7 +126,7 @@ void SdDLL::RegisterControllers() ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod); ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod); ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod); - ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod); + ::sd::ToolPanelChildWindow::RegisterChildWindowIfEnabled(0, pMod); ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindowIfEnabled(0, pMod); SvxFillToolBoxControl::RegisterControl(0, pMod); diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index df7997401228..30e5b2fac961 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -215,6 +215,14 @@ void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL ) } } +void ToolPanelChildWindow::RegisterChildWindowIfEnabled (sal_Bool bVisible, + SfxModule *pMod, + sal_uInt16 nFlags) +{ + if ( ! SfxViewFrame::IsSidebarEnabled() ) + RegisterChildWindow( bVisible, pMod, nFlags ); +} + } // end of namespace ::sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index b2f63d904733..dc93ae0f536d 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -70,6 +70,8 @@ public: SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow ); + static void RegisterChildWindowIfEnabled (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); + // ::sfx2::ITaskPaneToolPanelAccess virtual void ActivateToolPanel( const OUString& i_rPanelURL ); }; |