diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 10:29:10 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 12:42:04 +0200 |
commit | d5c3e8004b2a3df1c0f624639e7dd3a650b868ac (patch) | |
tree | 015cbd1223ac7a6b0558d92708a0074396586f34 /framework/source/layoutmanager | |
parent | 344957aae65637c64b4f6d16f64c4488ddd2d085 (diff) |
drop enum framework::GlobalSettings::UIElementType
since we only ever use the one enumerator.
Consequently renaming some methods
Change-Id: Ia8c022135df6661b8f300e037ea3e7cf610b63ac
Diffstat (limited to 'framework/source/layoutmanager')
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 2f9f88160cd6..425b57879739 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -584,18 +584,18 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem // oversteer values with global settings if ( pGlobalSettings && ( bGetSettingsState || bGlobalSettings )) { - if ( pGlobalSettings->HasStatesInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR )) + if ( pGlobalSettings->HasToolbarStatesInfo()) { SolarMutexClearableGuard aWriteLock2; bInGlobalSettings = true; aWriteLock2.clear(); uno::Any aValue; - if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR, + if ( pGlobalSettings->GetToolbarStateInfo( GlobalSettings::STATEINFO_LOCKED, aValue )) aValue >>= rElementData.m_aDockedData.m_bLocked; - if ( pGlobalSettings->GetStateInfo( GlobalSettings::UIELEMENT_TYPE_TOOLBAR, + if ( pGlobalSettings->GetToolbarStateInfo( GlobalSettings::STATEINFO_DOCKED, aValue )) { |