summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
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 /sfx2/source/appl
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 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/app.cxx1
-rw-r--r--sfx2/source/appl/appreg.cxx1
-rw-r--r--sfx2/source/appl/module.cxx12
-rw-r--r--sfx2/source/appl/workwin.cxx45
4 files changed, 14 insertions, 45 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index aaba69dcc98f..555a62f61dac 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -168,7 +168,6 @@ SfxApplication* SfxApplication::GetOrCreate()
::framework::SetStatusBarControllerCreator( SfxStatusBarControllerFactory );
::framework::SetDockingWindowCreator( SfxDockingWindowFactory );
::framework::SetIsDockingWindowVisible( IsDockingWindowVisible );
- ::framework::SetActivateToolPanel( &SfxViewFrame::ActivateToolPanel );
#if HAVE_FEATURE_DESKTOP
Application::SetHelp( pSfxHelp );
if (!utl::ConfigManager::IsAvoidConfig() && SvtHelpOptions().IsHelpTips())
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index fb04a9dcfa8e..a77744082c55 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -28,7 +28,6 @@
#include <sfx2/stbitem.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/navigat.hxx>
-#include <sfx2/taskpane.hxx>
#include <sfx2/module.hxx>
#include <sfx2/viewfrm.hxx>
#include "partwnd.hxx"
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 9d46fbf4208e..5e2e7ad44c8e 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -34,7 +34,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/tabdlg.hxx>
#include <svl/intitem.hxx>
-#include <sfx2/taskpane.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
@@ -363,17 +362,6 @@ void SfxModule::Invalidate( sal_uInt16 nId )
Invalidate_Impl( pFrame->GetBindings(), nId );
}
-bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const
-{
- if ( i_nId != SID_TASKPANE )
- // by default, assume it is
- return true;
-
- const SfxViewFrame* pViewFrame = i_pViewFrame ? i_pViewFrame : GetFrame();
- ENSURE_OR_RETURN( pViewFrame, "SfxModule::IsChildWindowAvailable: no frame to ask for the module identifier!", false );
- return ::sfx2::ModuleTaskPane::ModuleHasToolPanels( pViewFrame->GetFrame().GetFrameInterface() );
-}
-
SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame )
{
if ( !pFrame )
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index e1e7e1cd08fc..eb91b2c62e43 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1335,16 +1335,6 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
}
}
-bool SfxWorkWindow::AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const
-{
- // or checking the availability of child windows, we need access to the module
- const SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
- const SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : nullptr;
- const SfxModule* pModule = pShell ? pShell->GetModule() : nullptr;
- ENSURE_OR_RETURN( pModule, "SfxWorkWindow::UpdateChildWindows_Impl: did not find an SfxModule to ask for the child win availability!", true );
- return pModule->IsChildWindowAvailable( i_rCW.nId, pViewFrame );
-}
-
void SfxWorkWindow::UpdateChildWindows_Impl()
{
// any current or in the context available Childwindows
@@ -1378,9 +1368,6 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
else
bCreate = true;
- if ( bCreate )
- bCreate = AllowChildWindowCreation_Impl( *pCW );
-
// Currently, no window here, but it is enabled; windows
// Create window and if possible theContext
if ( bCreate )
@@ -1398,25 +1385,21 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( ( !bIsFullScreen || pChildWin->GetAlignment() == SfxChildAlignment::NOALIGNMENT ) && bAllChildrenVisible )
{
// Update Mode is compatible; definitely enable it
- bCreate = AllowChildWindowCreation_Impl( *pCW );
- if ( bCreate )
+ if ( pCW->pCli )
{
- if ( pCW->pCli )
- {
- // The window is a direct Child
- if ( bAllChildrenVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SfxChildAlignment::NOALIGNMENT ) )
- pCW->pCli->nVisible |= SfxChildVisibility::NOT_HIDDEN;
- }
- else
- {
- if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )
- // The window ia within a SplitWindow
- static_cast<SfxDockingWindow*>(pChildWin->GetWindow())->Reappear_Impl();
- }
-
- if ( pCW->nInterfaceId != pChildWin->GetContextId() )
- pChildWin->CreateContext( pCW->nInterfaceId, GetBindings() );
+ // The window is a direct Child
+ if ( bAllChildrenVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SfxChildAlignment::NOALIGNMENT ) )
+ pCW->pCli->nVisible |= SfxChildVisibility::NOT_HIDDEN;
}
+ else
+ {
+ if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )
+ // The window ia within a SplitWindow
+ static_cast<SfxDockingWindow*>(pChildWin->GetWindow())->Reappear_Impl();
+ }
+
+ if ( pCW->nInterfaceId != pChildWin->GetContextId() )
+ pChildWin->CreateContext( pCW->nInterfaceId, GetBindings() );
}
}
}
@@ -1961,7 +1944,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus)
}
else
{
- pCW->bCreate = AllowChildWindowCreation_Impl( *pCW );
+ pCW->bCreate = true;
if ( pCW->bCreate )
{
if ( pChild )