diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-23 15:20:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-24 08:12:28 +0000 |
| commit | 1506b14a7ed546c3e78625eaac667bdd5e60f57f (patch) | |
| tree | c73e9ab2b69a74af4c3a6bcc67413e97b0529e8f /sfx2/source/appl | |
| parent | 0c73e7364b2fe4a8b24eca536f60a7a4228ddb25 (diff) | |
loplugin:singlevalfields in sfx2
Change-Id: Ice6d47ccbc3ebf8971887b8b64c0d6860c76eec8
Reviewed-on: https://gerrit.libreoffice.org/26602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appdata.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 17 |
3 files changed, 5 insertions, 20 deletions
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 92a315b825a1..e60ec8a6ef83 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -104,7 +104,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) , pPool(nullptr) , pProgress(nullptr) , nDocModalMode(0) - , nAutoTabPageId(0) , nRescheduleLocks(0) , nInReschedule(0) , m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessComponentContext())) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 116e3865d325..1d1fdb8ed16f 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -61,7 +61,6 @@ struct SfxChildWindow_Impl SfxChildWinFactory* pFact; bool bHideNotDelete; bool bVisible; - bool bHideAtToggle; bool bWantsFocus; SfxModule* pContextModule; SfxWorkWindow* pWorkWin; @@ -162,7 +161,6 @@ SfxChildWindow::SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId) { pImpl->pFact = nullptr; pImpl->bHideNotDelete = false; - pImpl->bHideAtToggle = false; pImpl->bWantsFocus = true; pImpl->bVisible = true; pImpl->pContextModule = nullptr; @@ -558,11 +556,6 @@ bool SfxChildWindow::IsHideNotDelete() const return pImpl->bHideNotDelete; } -bool SfxChildWindow::IsHideAtToggle() const -{ - return pImpl->bHideAtToggle; -} - void SfxChildWindow::SetWantsFocus( bool bSet ) { pImpl->bWantsFocus = bSet; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 537405c13447..0b7711bfb1ae 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1295,7 +1295,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() { SfxChildWindow *pChildWin = pCW->pWin; bool bCreate = false; - if ( pCW->nId && !pCW->bDisabled && (pCW->aInfo.nFlags & SfxChildWindowFlags::ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) ) + if ( pCW->nId && (pCW->aInfo.nFlags & SfxChildWindowFlags::ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) ) { // In the context is an appropriate ChildWindow allowed; // it is also turned on? @@ -1493,7 +1493,7 @@ void SfxWorkWindow::UpdateStatusBar_Impl() // No status bar, if no ID is required or when in FullScreenView or // if disabled if ( aStatBar.nId && IsDockingAllowed() && bInternalDockingAllowed && bShowStatusBar && - ( (aStatBar.bOn && !bIsFullScreen) || aStatBar.bTemp ) ) + aStatBar.bOn && !bIsFullScreen ) { // Id has changed, thus create a suitable Statusbarmanager, this takes // over the current status bar; @@ -1876,16 +1876,9 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus) if ( pChild->QueryClose() ) { pCW->bCreate = false; - if ( pChild->IsHideAtToggle() ) - { - ShowChildWindow_Impl( nId, false, bSetFocus ); - } - else - { - // The Window should be switched off - pChild->SetVisible_Impl( false ); - RemoveChildWin_Impl( pCW ); - } + // The Window should be switched off + pChild->SetVisible_Impl( false ); + RemoveChildWin_Impl( pCW ); } } else |