diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-10-31 22:04:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-01 15:14:33 +0100 |
| commit | 7a896f183dca54aa9d8529f5797920cf629f9210 (patch) | |
| tree | c4475c2352c5dcab2521709db12199fa7084c2fb /svtools | |
| parent | 9aa8552bf9168836662b45798e06de4b972550ed (diff) | |
use officecfg for Experimental flag
move IsShowOutlineContentVisibilityButton out of header to
avoid having to add extra include paths to all the unit
test makefiles.
Change-Id: I2763390e07cd85b8f09b6f2ad7702039daecb22f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105100
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/miscopt.cxx | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index e6cb2bce00f1..dc01682d344e 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -60,14 +60,12 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 6 #define PROPERTYNAME_DISABLEUICUSTOMIZATION "DisableUICustomization" #define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 7 -#define PROPERTYNAME_EXPERIMENTALMODE "ExperimentalMode" -#define PROPERTYHANDLE_EXPERIMENTALMODE 8 #define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode" -#define PROPERTYHANDLE_MACRORECORDERMODE 9 +#define PROPERTYHANDLE_MACRORECORDERMODE 8 #define PROPERTYNAME_SIDEBARICONSIZE "SidebarIconSize" -#define PROPERTYHANDLE_SIDEBARICONSIZE 10 +#define PROPERTYHANDLE_SIDEBARICONSIZE 9 #define PROPERTYNAME_NOTEBOOKBARICONSIZE "NotebookbarIconSize" -#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 11 +#define PROPERTYHANDLE_NOTEBOOKBARICONSIZE 10 class SvtMiscOptions_Impl : public ConfigItem { @@ -91,7 +89,6 @@ private: bool m_bShowLinkWarningDialog; bool m_bIsShowLinkWarningDialogRO; bool m_bDisableUICustomization; - bool m_bExperimentalMode; bool m_bMacroRecorderMode; bool m_bIconThemeWasSetAutomatically; @@ -136,12 +133,6 @@ public: bool DisableUICustomization() const { return m_bDisableUICustomization; } - void SetExperimentalMode( bool bSet ) - { m_bExperimentalMode = bSet; SetModified(); } - - bool IsExperimentalMode() const - { return m_bExperimentalMode; } - void SetMacroRecorderMode( bool bSet ) { m_bMacroRecorderMode = bSet; SetModified(); } @@ -254,7 +245,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() , m_bIsUseSystemPrintDialogRO( false ) , m_bShowLinkWarningDialog( true ) , m_bIsShowLinkWarningDialogRO( false ) - , m_bExperimentalMode( false ) , m_bMacroRecorderMode( false ) , m_bIconThemeWasSetAutomatically( false ) { @@ -379,12 +369,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); break; } - case PROPERTYHANDLE_EXPERIMENTALMODE : - { - if( !(seqValues[nProperty] >>= m_bExperimentalMode) ) - OSL_FAIL("Wrong type of \"Misc\\ExperimentalMode\"!" ); - break; - } case PROPERTYHANDLE_MACRORECORDERMODE : { if( !(seqValues[nProperty] >>= m_bMacroRecorderMode) ) @@ -675,11 +659,6 @@ void SvtMiscOptions_Impl::ImplCommit() seqValues[nProperty] <<= m_bDisableUICustomization; break; } - case PROPERTYHANDLE_EXPERIMENTALMODE : - { - seqValues[nProperty] <<= m_bExperimentalMode; - break; - } case PROPERTYHANDLE_MACRORECORDERMODE : { seqValues[nProperty] <<= m_bMacroRecorderMode; @@ -706,7 +685,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() PROPERTYNAME_USESYSTEMPRINTDIALOG, PROPERTYNAME_SHOWLINKWARNINGDIALOG, PROPERTYNAME_DISABLEUICUSTOMIZATION, - PROPERTYNAME_EXPERIMENTALMODE, PROPERTYNAME_MACRORECORDERMODE, PROPERTYNAME_SIDEBARICONSIZE, PROPERTYNAME_NOTEBOOKBARICONSIZE @@ -866,16 +844,6 @@ bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const return m_pImpl->IsShowLinkWarningDialogReadOnly(); } -void SvtMiscOptions::SetExperimentalMode( bool bSet ) -{ - m_pImpl->SetExperimentalMode( bSet ); -} - -bool SvtMiscOptions::IsExperimentalMode() const -{ - return m_pImpl->IsExperimentalMode(); -} - void SvtMiscOptions::SetMacroRecorderMode( bool bSet ) { m_pImpl->SetMacroRecorderMode( bSet ); |