From 5ae11320a26a6356dfadeb812e0d6baf5bdc951c Mon Sep 17 00:00:00 2001 From: Cor Nouws Date: Sun, 10 Jun 2012 23:00:36 +0200 Subject: Give Macro recorder separate option, apart from Experimental features Change-Id: I9dbf5d510ebaff8448a152d75a006a183303bd81 --- svtools/inc/svtools/miscopt.hxx | 3 +++ svtools/source/config/miscopt.cxx | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'svtools') diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx index 66eb0c1ddc09..2f89993db4ed 100644 --- a/svtools/inc/svtools/miscopt.hxx +++ b/svtools/inc/svtools/miscopt.hxx @@ -121,6 +121,9 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options void SetExperimentalMode( sal_Bool bSet ); sal_Bool IsExperimentalMode() const; + void SetMacroRecorderMode( sal_Bool bSet ); + sal_Bool IsMacroRecorderMode() const; + private: /*-****************************************************************************************************//** diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 51d2ee7917cc..74b9b616d159 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -74,6 +74,8 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_ALWAYSALLOWSAVE 9 #define PROPERTYNAME_EXPERIMENTALMODE ASCII_STR("ExperimentalMode") #define PROPERTYHANDLE_EXPERIMENTALMODE 10 +#define PROPERTYNAME_MACRORECORDERMODE ASCII_STR("MacroRecorderMode") +#define PROPERTYHANDLE_MACRORECORDERMODE 11 #define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from @@ -99,6 +101,7 @@ class SvtMiscOptions_Impl : public ConfigItem sal_Bool m_bDisableUICustomization; sal_Bool m_bAlwaysAllowSave; sal_Bool m_bExperimentalMode; + sal_Bool m_bMacroRecorderMode; public: @@ -179,6 +182,12 @@ class SvtMiscOptions_Impl : public ConfigItem inline sal_Bool IsExperimentalMode() const { return m_bExperimentalMode; } + inline void SetMacroRecorderMode( sal_Bool bSet ) + { m_bMacroRecorderMode = bSet; SetModified(); } + + inline sal_Bool IsMacroRecorderMode() const + { return m_bMacroRecorderMode; } + inline sal_Bool IsPluginsEnabled() const { return m_bPluginsEnabled; } @@ -287,6 +296,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() , m_bIsShowLinkWarningDialogRO( sal_False ) , m_bAlwaysAllowSave( sal_False ) , m_bExperimentalMode( sal_False ) + , m_bMacroRecorderMode( sal_False ) { // Use our static list of configuration keys to get his values. @@ -409,6 +419,12 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() OSL_FAIL("Wrong type of \"Misc\\ExperimentalMode\"!" ); break; } + case PROPERTYHANDLE_MACRORECORDERMODE : + { + if( !(seqValues[nProperty] >>= m_bMacroRecorderMode) ) + OSL_FAIL("Wrong type of \"Misc\\MacroRecorderMode\"!" ); + break; + } } } @@ -700,6 +716,11 @@ void SvtMiscOptions_Impl::Commit() seqValues[nProperty] <<= m_bExperimentalMode; break; } + case PROPERTYHANDLE_MACRORECORDERMODE : + { + seqValues[nProperty] <<= m_bMacroRecorderMode; + break; + } } } // Set properties in configuration. @@ -724,7 +745,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() PROPERTYNAME_SHOWLINKWARNINGDIALOG, PROPERTYNAME_DISABLEUICUSTOMIZATION, PROPERTYNAME_ALWAYSALLOWSAVE, - PROPERTYNAME_EXPERIMENTALMODE + PROPERTYNAME_EXPERIMENTALMODE, + PROPERTYNAME_MACRORECORDERMODE }; // Initialize return sequence with these list ... @@ -915,6 +937,16 @@ sal_Bool SvtMiscOptions::IsExperimentalMode() const return m_pDataContainer->IsExperimentalMode(); } +void SvtMiscOptions::SetMacroRecorderMode( sal_Bool bSet ) +{ + m_pDataContainer->SetMacroRecorderMode( bSet ); +} + +sal_Bool SvtMiscOptions::IsMacroRecorderMode() const +{ + return m_pDataContainer->IsMacroRecorderMode(); +} + namespace { class theSvtMiscOptionsMutex : -- cgit