diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-24 13:22:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-24 12:18:42 +0000 |
| commit | f2f8835bfb1ec57885c94aa2aac8d1a17fc09ed3 (patch) | |
| tree | 88dbcb5844d296a649387201ea7a9fa752f22223 /framework/source/layoutmanager | |
| parent | 136a2fd6c08193793d546e69108765316c96668b (diff) | |
loplugin:singlevalfields in framework
Change-Id: I5f5efe2180905343654bdbe4d765e7fd311a2d8a
Reviewed-on: https://gerrit.libreoffice.org/26636
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source/layoutmanager')
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 7 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1 | ||||
| -rw-r--r-- | framework/source/layoutmanager/uielement.cxx | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index e8779f1d9778..4424595343b3 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -65,7 +65,6 @@ ToolbarLayoutManager::ToolbarLayoutManager( m_bStoreWindowState( false ), m_bGlobalSettings( false ), m_bDockingInProgress( false ), - m_bVisible( true ), m_bLayoutInProgress( false ), m_bToolbarCreation( false ) { @@ -711,11 +710,7 @@ void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars ) { UIElementVector aUIElementVector; - SolarMutexClearableGuard aReadLock; - bool bVisible( m_bVisible ); - aReadLock.clear(); - - if ( !bVisible || !bAutomaticToolbars ) + if ( !bAutomaticToolbars ) return; implts_getUIElementVectorCopy( aUIElementVector ); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index ebab9ad59135..2f0beb0a7fe7 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -291,7 +291,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW bool m_bStoreWindowState; bool m_bGlobalSettings; bool m_bDockingInProgress; - bool m_bVisible; bool m_bLayoutInProgress; bool m_bToolbarCreation; }; diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx index 1dd14ae15517..4bb67b0f8fb8 100644 --- a/framework/source/layoutmanager/uielement.cxx +++ b/framework/source/layoutmanager/uielement.cxx @@ -111,8 +111,6 @@ UIElement& UIElement::operator= ( const UIElement& rUIElement ) m_bFloating = rUIElement.m_bFloating; m_bVisible = rUIElement.m_bVisible; m_bUserActive = rUIElement.m_bUserActive; - m_bCreateNewRowCol0 = rUIElement.m_bCreateNewRowCol0; - m_bDeactiveHide = rUIElement.m_bDeactiveHide; m_bMasterHide = rUIElement.m_bMasterHide; m_bContextSensitive = rUIElement.m_bContextSensitive; m_bContextActive = rUIElement.m_bContextActive; |