diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 10:41:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 17:57:11 +0200 |
commit | 44f32fc9c1cf95c77b725a4aa0ab405330135ad6 (patch) | |
tree | a224dc524d0665747d8d0109ade61aa5776d519d /svtools | |
parent | 44cc59db6f4f4f8b2ce5c993a31b5a019a8d7e97 (diff) |
use officecfg to retrieve SidebarIconSize
Change-Id: Id1cc4b8e3e28d942b44deacafbc514bbcd95874c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119411
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/config/miscopt.cxx | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 6ebb4124c9ab..4d1f4575d885 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_SYMBOLSET 0 #define PROPERTYNAME_ICONTHEME "SymbolStyle" #define PROPERTYHANDLE_SYMBOLSTYLE 1 -#define PROPERTYNAME_SIDEBARICONSIZE "SidebarIconSize" -#define PROPERTYHANDLE_SIDEBARICONSIZE 2 class SvtMiscOptions_Impl : public ConfigItem { @@ -56,8 +54,6 @@ private: ::std::vector<Link<LinkParamNone*,void>> aList; sal_Int16 m_nSymbolsSize; bool m_bIsSymbolsSizeRO; - ToolBoxButtonSize m_nSidebarIconSize; - bool m_bIsSidebarIconSizeRO; bool m_bIsSymbolsStyleRO; bool m_bIconThemeWasSetAutomatically; @@ -92,13 +88,8 @@ public: sal_Int16 GetSymbolsSize() const { return m_nSymbolsSize; } - ToolBoxButtonSize GetSidebarIconSize() const - { return m_nSidebarIconSize; } - void SetSymbolsSize( sal_Int16 nSet ); - void SetSidebarIconSize( ToolBoxButtonSize nSet ); - static OUString GetIconTheme(); enum class SetModifiedFlag { SET, DONT_SET }; @@ -150,8 +141,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() , m_nSymbolsSize( 0 ) , m_bIsSymbolsSizeRO( false ) - , m_nSidebarIconSize( ToolBoxButtonSize::DontCare ) - , m_bIsSidebarIconSizeRO( false ) , m_bIsSymbolsStyleRO( false ) , m_bIconThemeWasSetAutomatically( false ) { @@ -184,18 +173,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() break; } - case PROPERTYHANDLE_SIDEBARICONSIZE : - { - sal_uInt16 nTmp; - if( !(seqValues[nProperty] >>= nTmp) ) - { - OSL_FAIL("Wrong type of \"Misc\\SidebarIconSize\"!" ); - } else - m_nSidebarIconSize = static_cast<ToolBoxButtonSize>(nTmp); - m_bIsSidebarIconSizeRO = seqRO[nProperty]; - break; - } - case PROPERTYHANDLE_SYMBOLSTYLE : { OUString aIconTheme; @@ -249,15 +226,6 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) } } break; - case PROPERTYHANDLE_SIDEBARICONSIZE : { - sal_uInt16 nTmp; - if( !(seqValues[nProperty] >>= nTmp) ) - { - OSL_FAIL("Wrong type of \"Misc\\SidebarIconSize\"!" ); - } else - m_nSidebarIconSize = static_cast<ToolBoxButtonSize>(nTmp); - } - break; case PROPERTYHANDLE_SYMBOLSTYLE : { OUString aIconTheme; if (seqValues[nProperty] >>= aIconTheme) @@ -293,13 +261,6 @@ void SvtMiscOptions_Impl::SetSymbolsSize( sal_Int16 nSet ) CallListeners(); } -void SvtMiscOptions_Impl::SetSidebarIconSize( ToolBoxButtonSize nSet ) -{ - m_nSidebarIconSize = nSet; - SetModified(); - CallListeners(); -} - OUString SvtMiscOptions_Impl::GetIconTheme() { return Application::GetSettings().GetStyleSettings().DetermineIconTheme(); @@ -360,13 +321,6 @@ void SvtMiscOptions_Impl::ImplCommit() break; } - case PROPERTYHANDLE_SIDEBARICONSIZE : - { - if ( !m_bIsSidebarIconSizeRO ) - seqValues[nProperty] <<= static_cast<sal_uInt16>(m_nSidebarIconSize); - break; - } - case PROPERTYHANDLE_SYMBOLSTYLE : { if ( !m_bIsSymbolsStyleRO ) { @@ -397,7 +351,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() { PROPERTYNAME_SYMBOLSET, PROPERTYNAME_ICONTHEME, - PROPERTYNAME_SIDEBARICONSIZE }; } @@ -440,16 +393,6 @@ void SvtMiscOptions::SetSymbolsSize( sal_Int16 nSet ) m_pImpl->SetSymbolsSize( nSet ); } -ToolBoxButtonSize SvtMiscOptions::GetSidebarIconSize() const -{ - return m_pImpl->GetSidebarIconSize(); -} - -void SvtMiscOptions::SetSidebarIconSize( ToolBoxButtonSize nSet ) -{ - m_pImpl->SetSidebarIconSize( nSet ); -} - sal_Int16 SvtMiscOptions::GetCurrentSymbolsSize() const { sal_Int16 eOptSymbolsSize = m_pImpl->GetSymbolsSize(); |