diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-15 17:22:39 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-17 08:27:55 +0000 |
commit | 7dd77a12713c0557c5826d3541e97ef6120e1d00 (patch) | |
tree | 7b6654d6cd90616e96256deb6e3933d80235b7c0 /sfx2/source/appl/workwin.cxx | |
parent | 5b44a9733a79decc2eebfc2360fdd837349b5759 (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/workwin.cxx')
-rw-r--r-- | sfx2/source/appl/workwin.cxx | 45 |
1 files changed, 14 insertions, 31 deletions
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 ) |