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 /sfx2 | |
| parent | Transform the clipping polygon before using it (diff) | |
| download | core-ee1726bfdba483623d496a3bcc09089e8b55cd65.tar.gz core-ee1726bfdba483623d496a3bcc09089e8b55cd65.zip | |
sidebar: disable impress task pane if sidebar is enabled.
Change-Id: I64e601dfd6f4a3763188537f9507c536b86b70fe
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 64094df62e6d..6aee3b0917d1 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -3418,21 +3418,26 @@ bool SfxViewFrame::IsSidebarEnabled() } // rip out the services from framework/ for good measure - if( !bEnabled ) + try { - try + uno::Reference< ui::XUIElementFactoryManager > xUIElementFactory = ui::UIElementFactoryManager::create( xContext ); + if( !bEnabled ) { - uno::Reference< ui::XUIElementFactoryManager > xUIElementFactory = ui::UIElementFactoryManager::create( xContext ); xUIElementFactory->deregisterFactory( "toolpanel", "ScPanelFactory", "" ); xUIElementFactory->deregisterFactory( "toolpanel", "SwPanelFactory", "" ); xUIElementFactory->deregisterFactory( "toolpanel", "SvxPanelFactory", "" ); xUIElementFactory->deregisterFactory( "toolpanel", "SdPanelFactory", "" ); } - catch ( const uno::Exception &e ) + else { - SAL_WARN( "sfx2.view", "Exception de-registering sidebar factories " << e.Message ); + xUIElementFactory->deregisterFactory( "toolpanel", "DrawingFramework", + "com.sun.star.presentation.PresentationDocument" ); } } + catch ( const uno::Exception &e ) + { + SAL_WARN( "sfx2.view", "Exception de-registering sidebar factories " << e.Message ); + } } return bEnabled; |