diff options
23 files changed, 56 insertions, 47 deletions
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index d1d410d09037..bd1a48fe116f 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -34,7 +34,7 @@ namespace dxcanvas DXCanvasItem::DXCanvasItem() : ConfigItem( "Office.Canvas/DXCanvas", - CONFIG_MODE_IMMEDIATE_UPDATE ), + ConfigItemMode::ImmediateUpdate ), maValues(), maMaxTextureSize(), mbBlacklistCurrentDevice(false), diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 255035617c1d..86157c8bf031 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -56,7 +56,7 @@ Sequence<OUString> BibConfig::GetPropertyNames() } BibConfig::BibConfig() - : ConfigItem("Office.DataAccess/Bibliography", CONFIG_MODE_DELAYED_UPDATE) + : ConfigItem("Office.DataAccess/Bibliography", ConfigItemMode::DelayedUpdate) , nTblOrQuery(0) , pMappingsArr(new MappingArray) , nBeamerSize(0) diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 63cbafb67105..f194385b0654 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -69,8 +69,8 @@ class FilterCache : private TransactionBase // constructor / destructor - FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION, - sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); + FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION, + ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE ); /*-**************************************************************************************************** @short standard destructor to delete instance diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 60a579edb1c5..e8d231cf2146 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -46,7 +46,7 @@ namespace framework{ #define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one. -#define DEFAULT_FILTERCACHE_MODE CONFIG_MODE_DELAYED_UPDATE | CONFIG_MODE_ALL_LOCALES /// ConfigItems could run in different modes: supported values are ... { CONFIG_MODE_IMMEDIATE_UPDATE, CONFIG_MODE_DELAYED_UPDATE, CONFIG_MODE_ALL_LOCALES } +#define DEFAULT_FILTERCACHE_MODE ConfigItemMode::DelayedUpdate | ConfigItemMode::AllLocales /// ConfigItems could run in different modes: supported values are ... { ConfigItemMode::ImmediateUpdate, ConfigItemMode::DelayedUpdate, ConfigItemMode::AllLocales } enum EModifyState { @@ -569,7 +569,7 @@ class FilterCFGAccess : public ::utl::ConfigItem public: FilterCFGAccess ( const OUString& sPath , sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION , - sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration + ConfigItemMode nMode = DEFAULT_FILTERCACHE_MODE ); // open configuration virtual ~FilterCFGAccess( ); void read ( DataContainer& rData , diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 929ffd74e3bb..16a6f84b96e3 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/uno/Reference.h> #include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> +#include <o3tl/typed_flags_set.hxx> namespace com{ namespace sun{ namespace star{ namespace uno{ @@ -42,12 +43,20 @@ namespace com{ namespace sun{ namespace star{ } }}} +enum class ConfigItemMode +{ + ImmediateUpdate = 0x00, + DelayedUpdate = 0x01, + AllLocales = 0x02, + ReleaseTree = 0x04, +}; +namespace o3tl +{ + template<> struct typed_flags<ConfigItemMode> : is_typed_flags<ConfigItemMode, 0x07> {}; +} + namespace utl { -#define CONFIG_MODE_IMMEDIATE_UPDATE 0x00 -#define CONFIG_MODE_DELAYED_UPDATE 0x01 -#define CONFIG_MODE_ALL_LOCALES 0x02 -#define CONFIG_MODE_RELEASE_TREE 0x04 enum ConfigNameFormat { @@ -72,10 +81,10 @@ namespace utl m_xHierarchyAccess; com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > xChangeLstnr; - sal_Int16 m_nMode; - bool m_bIsModified; - bool m_bEnableInternalNotification; - sal_Int16 m_nInValueChange; + ConfigItemMode m_nMode; + bool m_bIsModified; + bool m_bEnableInternalNotification; + sal_Int16 m_nInValueChange; void RemoveChangesListener(); void CallNotify( @@ -107,7 +116,7 @@ namespace utl protected: explicit ConfigItem(const OUString &rSubTree, - sal_Int16 nMode = CONFIG_MODE_DELAYED_UPDATE); + ConfigItemMode nMode = ConfigItemMode::DelayedUpdate); void SetModified (); // mark item as modified void ClearModified(); // reset state after commit! @@ -173,7 +182,7 @@ namespace utl bool IsInValueChange() const { return m_nInValueChange > 0;} - sal_Int16 GetMode() const { return m_nMode;} + ConfigItemMode GetMode() const { return m_nMode;} }; }//namespace utl #endif // INCLUDED_UNOTOOLS_CONFIGITEM_HXX diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 7962290f2ae4..b75fc9f8281f 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -41,7 +41,7 @@ class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem public: ScLinkConfigItem( const OUString& rSubTree ); - ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ); + ScLinkConfigItem( const OUString& rSubTree, ConfigItemMode nMode ); void SetCommitLink( const Link<>& rLink ); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames ) SAL_OVERRIDE; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 44470fa3cdba..fd8571a600e4 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -364,7 +364,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScAddInCfg& rAddInConfig = SC_MOD()->GetAddInCfg(); // additional, temporary config item for the compatibility names - ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), CONFIG_MODE_ALL_LOCALES ); + ScLinkConfigItem aAllLocalesConfig( OUString(CFGPATH_ADDINS), ConfigItemMode::AllLocales ); // CommitLink is not used (only reading values) const OUString sSlash('/'); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 76a61b5c9fc8..f951089f4fcf 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -37,7 +37,7 @@ ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree ) : { } -ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, sal_Int16 nMode ) : +ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree, ConfigItemMode nMode ) : ConfigItem( rSubTree, nMode ) { } diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index b5fe90a5c708..15232766e143 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -202,7 +202,7 @@ private: public: StorageItem( PasswordContainer* point, const OUString& path ) : - ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ), + ConfigItem( path, ConfigItemMode::ImmediateUpdate ), mainCont( point ), hasEncoded( false ) { diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index e0cb7d5fd87f..adb9eb28f8bf 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star; SysCredentialsConfigItem::SysCredentialsConfigItem( SysCredentialsConfig * pOwner ) : utl::ConfigItem( OUString("Office.Common/Passwords"), - CONFIG_MODE_IMMEDIATE_UPDATE ), + ConfigItemMode::ImmediateUpdate ), m_bInited( false ), m_pOwner( pOwner ) { diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 638f141cb468..9480956fc422 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -627,7 +627,7 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing() FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE) + ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), ConfigItemMode::DelayedUpdate) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( 0 ) ,m_nActivationEvent( 0 ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 43c1e656c188..51f0e9745fc8 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -191,7 +191,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, : SfxModalDialog(rView.GetWindow(), "InsertDbColumnsDialog", "modules/swriter/ui/insertdbcolumnsdialog.ui") , ConfigItem("Office.Writer/InsertData/DataSet", - CONFIG_MODE_DELAYED_UPDATE) + ConfigItemMode::DelayedUpdate) , aDBData(rData) , sNoTmpl(SW_RESSTR(SW_STR_NONE)) , pView(&rView) diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx index d0b8ce3431a3..88cef259b597 100644 --- a/sw/source/uibase/config/barcfg.cxx +++ b/sw/source/uibase/config/barcfg.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star::uno; SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) : ConfigItem(bWeb ? OUString("Office.WriterWeb/ObjectBar") : OUString("Office.Writer/ObjectBar"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) { for(sal_uInt16 i = 0; i <= SEL_TYPE_GRAPHIC; i++ ) aTbxIdArray[i] = -1; diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx index d3114c8ca9d1..054c06c9a564 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -53,7 +53,7 @@ const Sequence<OUString>& SwDBConfig::GetPropertyNames() SwDBConfig::SwDBConfig() : ConfigItem("Office.DataAccess", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), pAdrImpl(0), pBibImpl(0) { diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index a9d5392a1ef5..d7ab106831dc 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -245,7 +245,7 @@ const Sequence<OUString>& SwRevisionConfig::GetPropertyNames() SwRevisionConfig::SwRevisionConfig() : ConfigItem("Office.Writer/Revision", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) { aInsertAttr.nItemId = SID_ATTR_CHAR_UNDERLINE; aInsertAttr.nAttr = UNDERLINE_SINGLE; @@ -589,7 +589,7 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames() SwInsertConfig::SwInsertConfig(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Insert") : OUString("Office.Writer/Insert"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), pCapOptions(0), pOLEMiscOpt(0), bInsWithCaption( false ), @@ -1123,7 +1123,7 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames() SwTableConfig::SwTableConfig(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) { Load(); } @@ -1188,7 +1188,7 @@ void SwTableConfig::Load() SwMiscConfig::SwMiscConfig() : ConfigItem("Office.Writer", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), bDefaultFontsInCurrDocOnly(false), bShowIndexPreview(false), bGrfToGalleryAsLnk(true), @@ -1325,7 +1325,7 @@ const Sequence<OUString>& SwCompareConfig::GetPropertyNames() SwCompareConfig::SwCompareConfig() : ConfigItem("Office.Writer/Comparison", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) ,m_bStoreRsid(true) { eCmpMode = SVX_CMP_AUTO; diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index 39672cfba3ce..8899ad2ea63a 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -64,7 +64,7 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() SwPrintOptions::SwPrintOptions(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Print") : OUString("Office.Writer/Print"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), bIsWeb(bWeb) { bPrintPageBackground = !bWeb; diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 566b590049ae..4acbe987b471 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -249,7 +249,7 @@ Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() SwLayoutViewConfig::SwLayoutViewConfig(bool bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Layout") : OUString("Office.Writer/Layout"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), rParent(rPar), bWeb(bIsWeb) { @@ -385,7 +385,7 @@ Sequence<OUString> SwGridConfig::GetPropertyNames() SwGridConfig::SwGridConfig(bool bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Grid") : OUString("Office.Writer/Grid"), - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), rParent(rPar) { } @@ -471,7 +471,7 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames() SwCursorConfig::SwCursorConfig(SwMasterUsrPref& rPar) : ConfigItem("Office.Writer/Cursor", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), rParent(rPar) { } @@ -536,7 +536,7 @@ void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : ConfigItem("Office.WriterWeb/Background", - CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE), + ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), rParent(rPar), aPropNames(1) { diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index c8218c52981b..cec51c7d9292 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -179,7 +179,7 @@ public: }; SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : - ConfigItem("Office.Writer/MailMergeWizard", 0), + ConfigItem("Office.Writer/MailMergeWizard", ConfigItemMode::ImmediateUpdate), nResultSetCursorPos(-1), nCurrentAddressBlock(0), bIsAddressBlock(true), diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 97c4fabedcbd..2e32a0e0d8c1 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -167,14 +167,14 @@ void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) thro pParent->RemoveChangesListener(); } -ConfigItem::ConfigItem(const OUString &rSubTree, sal_Int16 nSetMode ) : +ConfigItem::ConfigItem(const OUString &rSubTree, ConfigItemMode nSetMode ) : sSubTree(rSubTree), m_nMode(nSetMode), m_bIsModified(false), m_bEnableInternalNotification(false), m_nInValueChange(0) { - if(0 != (nSetMode&CONFIG_MODE_RELEASE_TREE)) + if(nSetMode & ConfigItemMode::ReleaseTree) ConfigManager::getConfigManager().addConfigItem(*this); else m_xHierarchyAccess = ConfigManager::getConfigManager().addConfigItem(*this); @@ -201,7 +201,7 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& { // Safe impossible cases. // This method should be called for special ConfigItem-mode only! - OSL_ENSURE( ((m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_packLocalizedProperties()\nWrong call of this method detected!\n" ); + OSL_ENSURE( ((m_nMode & ConfigItemMode::AllLocales ) == ConfigItemMode::AllLocales), "ConfigItem::impl_packLocalizedProperties()\nWrong call of this method detected!\n" ); sal_Int32 nSourceCounter; // used to step during input lists sal_Int32 nSourceSize; // marks end of loop over input lists @@ -269,7 +269,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > { // Safe impossible cases. // This method should be called for special ConfigItem-mode only! - OSL_ENSURE( ((m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_unpackLocalizedProperties()\nWrong call of this method detected!\n" ); + OSL_ENSURE( ((m_nMode & ConfigItemMode::AllLocales ) == ConfigItemMode::AllLocales), "ConfigItem::impl_unpackLocalizedProperties()\nWrong call of this method detected!\n" ); sal_Int32 nSourceCounter; // used to step during input lists sal_Int32 nSourceSize; // marks end of loop over input lists @@ -442,7 +442,7 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames) } // In special mode "ALL_LOCALES" we must convert localized values to Sequence< PropertyValue >. - if((m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES) + if((m_nMode & ConfigItemMode::AllLocales ) == ConfigItemMode::AllLocales) { Sequence< Any > lValues; impl_packLocalizedProperties( rNames, aRet, lValues ); @@ -466,7 +466,7 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, const OUString* pNames = NULL; const Any* pValues = NULL; sal_Int32 nNameCount; - if(( m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES ) + if(( m_nMode & ConfigItemMode::AllLocales ) == ConfigItemMode::AllLocales ) { // If ConfigItem works in "ALL_LOCALES"-mode ... we must support a Sequence< PropertyValue > // as value of an localized configuration entry! @@ -536,7 +536,7 @@ bool ConfigItem::EnableNotification(const Sequence< OUString >& rNames, bool bEnableInternalNotification ) { - OSL_ENSURE(0 == (m_nMode&CONFIG_MODE_RELEASE_TREE), "notification in CONFIG_MODE_RELEASE_TREE mode not possible"); + OSL_ENSURE(bool(m_nMode & ConfigItemMode::ReleaseTree), "notification in ConfigItemMode::ReleaseTree mode not possible"); m_bEnableInternalNotification = bEnableInternalNotification; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); Reference<XChangesNotifier> xChgNot(xHierarchyAccess, UNO_QUERY); diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index c0a79eb7e3e6..bf74b5323653 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -151,7 +151,7 @@ utl::ConfigManager::acquireTree(utl::ConfigItem & item) { args[0] <<= css::beans::NamedValue( OUString("nodepath"), css::uno::makeAny("/org.openoffice." + item.GetSubTreeName())); - if ((item.GetMode() & CONFIG_MODE_ALL_LOCALES) != 0) { + if (item.GetMode() & ConfigItemMode::AllLocales) { args.realloc(2); args[1] <<= css::beans::NamedValue(OUString("locale"), css::uno::makeAny(OUString("*"))); } diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 49cf4f960d10..fc862ac689b1 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -109,7 +109,7 @@ public: GlobalEventConfig_Impl::GlobalEventConfig_Impl() - : ConfigItem( ROOTNODE_EVENTS, CONFIG_MODE_IMMEDIATE_UPDATE ) + : ConfigItem( ROOTNODE_EVENTS, ConfigItemMode::ImmediateUpdate ) { // the supported event names for (GlobalEventId id : o3tl::enumrange<GlobalEventId>()) diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 4f31f7f39b1b..6ec9e3b4660b 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -45,7 +45,7 @@ SettingsConfigItem* SettingsConfigItem::get() SettingsConfigItem::SettingsConfigItem() : ConfigItem( OUString( SETTINGS_CONFIGNODE ), - CONFIG_MODE_DELAYED_UPDATE ), + ConfigItemMode::DelayedUpdate ), m_aSettings( 0 ) { getValues(); diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index 00829ce61ad7..dabaddf244e3 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -67,7 +67,7 @@ sal_Int32 SelectionManager::getSelectionTimeout() DtransX11ConfigItem::DtransX11ConfigItem() : ConfigItem( OUString( SETTINGS_CONFIGNODE ), - CONFIG_MODE_DELAYED_UPDATE ), + ConfigItemMode::DelayedUpdate ), m_nSelectionTimeout( 3 ) { Sequence< OUString > aKeys( 1 ); |