diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 10:11:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 14:01:23 +0200 |
| commit | 252e403213bf2a1c1b1f7b07f1dd647b450cb312 (patch) | |
| tree | 05405a140a1e00cd3d49388c678a9bfb5763d59c /svtools | |
| parent | 2c0b84dc65739bfc47dca684e819717eb9cce387 (diff) | |
use officecfg to retrieve DisableUICustomization
Change-Id: I87b3019c8e10eb2453746340beea4c4623dc65e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119400
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/miscopt.cxx | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 96edcd27908c..4e72e97a289d 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -47,12 +47,10 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_SYMBOLSET 0 #define PROPERTYNAME_ICONTHEME "SymbolStyle" #define PROPERTYHANDLE_SYMBOLSTYLE 1 -#define PROPERTYNAME_DISABLEUICUSTOMIZATION "DisableUICustomization" -#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 2 #define PROPERTYNAME_SIDEBARICONSIZE "SidebarIconSize" -#define PROPERTYHANDLE_SIDEBARICONSIZE 3 +#define PROPERTYHANDLE_SIDEBARICONSIZE 2 #define PROPERTYNAME_NOTEBOOKBARICONSIZE "NotebookbarIconSize" -#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 4 +#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 3 class SvtMiscOptions_Impl : public ConfigItem { @@ -65,7 +63,6 @@ private: ToolBoxButtonSize m_nNotebookbarIconSize; bool m_bIsNotebookbarIconSizeRO; bool m_bIsSymbolsStyleRO; - bool m_bDisableUICustomization; bool m_bIconThemeWasSetAutomatically; virtual void ImplCommit() override; @@ -96,9 +93,6 @@ public: // public interface - bool DisableUICustomization() const - { return m_bDisableUICustomization; } - sal_Int16 GetSymbolsSize() const { return m_nSymbolsSize; } @@ -237,12 +231,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() break; } - case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : - { - if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); - break; - } } } @@ -310,11 +298,6 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" ); } break; - case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : { - if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); - } - break; } } } @@ -445,11 +428,6 @@ void SvtMiscOptions_Impl::ImplCommit() break; } - case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : - { - seqValues[nProperty] <<= m_bDisableUICustomization; - break; - } } } // Set properties in configuration. @@ -465,7 +443,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() { PROPERTYNAME_SYMBOLSET, PROPERTYNAME_ICONTHEME, - PROPERTYNAME_DISABLEUICUSTOMIZATION, PROPERTYNAME_SIDEBARICONSIZE, PROPERTYNAME_NOTEBOOKBARICONSIZE }; @@ -565,11 +542,6 @@ void SvtMiscOptions::SetIconTheme(const OUString& iconTheme) m_pImpl->SetIconTheme(iconTheme, SvtMiscOptions_Impl::SetModifiedFlag::SET); } -bool SvtMiscOptions::DisableUICustomization() const -{ - return m_pImpl->DisableUICustomization(); -} - namespace { class theSvtMiscOptionsMutex : |