summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-12-15 17:22:39 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-12-17 08:27:55 +0000
commit7dd77a12713c0557c5826d3541e97ef6120e1d00 (patch)
tree7b6654d6cd90616e96256deb6e3933d80235b7c0 /framework
parent5b44a9733a79decc2eebfc2360fdd837349b5759 (diff)
Remove unused ToolPanel (aka TaskPane)
Superseded by the Sidebar Change-Id: I54970d71cd9d42de4f47b223e50dd9474b40632a Reviewed-on: https://gerrit.libreoffice.org/20724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/fwe/classes/sfxhelperfunctions.cxx21
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx7
2 files changed, 0 insertions, 28 deletions
diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx
index 6ec7463e8eff..4926874cee64 100644
--- a/framework/source/fwe/classes/sfxhelperfunctions.cxx
+++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx
@@ -28,7 +28,6 @@ static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = nullptr
static pfunc_getRefreshToolbars pRefreshToolbars = nullptr;
static pfunc_createDockingWindow pCreateDockingWindow = nullptr;
static pfunc_isDockingWindowVisible pIsDockingWindowVisible = nullptr;
-static pfunc_activateToolPanel pActivateToolPanel = nullptr;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -145,26 +144,6 @@ bool SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFr
return false;
}
-pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator )
-{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- pfunc_activateToolPanel pOldFunc = pActivateToolPanel;
- pActivateToolPanel = i_pActivator;
- return pOldFunc;
-}
-
-void SAL_CALL ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
-{
- pfunc_activateToolPanel pActivator = nullptr;
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- pActivator = pActivateToolPanel;
- }
-
- ENSURE_OR_RETURN_VOID( pActivator, "framework::ActivateToolPanel: no activator function!" );
- (*pActivator)( i_rFrame, i_rPanelURL );
-}
-
using namespace ::com::sun::star;
uno::Reference<ui::XContextChangeEventListener> GetFirstListenerWith(
uno::Reference<uno::XInterface> const& xEventFocus,
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1c15c9faa55b..36a2d5431460 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1819,13 +1819,6 @@ throw (RuntimeException, std::exception)
impl_setDockingWindowVisibility( xContext, xFrame, aElementName, true );
}
- else if ( aElementType.equalsIgnoreAsciiCase("toolpanel"))
- {
- SolarMutexClearableGuard aReadGuard;
- uno::Reference< frame::XFrame > xFrame( m_xFrame );
- aReadGuard.clear();
- ActivateToolPanel( m_xFrame, aName );
- }
if ( bMustLayout )
doLayout();