From 67ff7348756ec88d09fc00e6d284ba5b579e9b33 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 6 Dec 2018 10:05:06 +0200 Subject: remove unused ConfigItemMode::DelayedUpdate unused ever since commit c1758889cbd5e8e4afb1044425c908715eb3e1cd Date: Fri Nov 11 22:48:37 2011 +0100 Heavily simplified utl::ConfigManager. and rename ConfigItemMode::ImmediateUpdate to NONE, since it doesn't mean that anymore Change-Id: Ia1d06142a25c9eea0f1d30b70653eed325a21b37 Reviewed-on: https://gerrit.libreoffice.org/64719 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/source/directx/dx_config.cxx | 2 +- extensions/source/bibliography/bibconfig.cxx | 2 +- include/unotools/configitem.hxx | 5 ++--- svl/source/passwordcontainer/passwordcontainer.hxx | 2 +- svl/source/passwordcontainer/syscreds.cxx | 2 +- svx/source/form/fmshimp.cxx | 2 +- sw/source/ui/dbui/dbinsdlg.cxx | 3 +-- sw/source/uibase/config/barcfg.cxx | 2 +- sw/source/uibase/config/dbconfig.cxx | 3 +-- sw/source/uibase/config/modcfg.cxx | 13 +++++-------- sw/source/uibase/config/prtopt.cxx | 2 +- sw/source/uibase/config/usrpref.cxx | 10 ++++------ sw/source/uibase/dbui/mmconfigitem.cxx | 2 +- unotools/source/config/eventcfg.cxx | 2 +- vcl/source/gdi/configsettings.cxx | 2 +- vcl/unx/generic/dtrans/config.cxx | 2 +- 16 files changed, 24 insertions(+), 32 deletions(-) diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 6da728e02f2e..487f04f0f686 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -36,7 +36,7 @@ namespace dxcanvas DXCanvasItem::DXCanvasItem() : ConfigItem( "Office.Canvas/DXCanvas", - ConfigItemMode::ImmediateUpdate ), + ConfigItemMode::NONE ), maValues(), maMaxTextureSize(), mbBlacklistCurrentDevice(false), diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 710b7696c1d1..22a558ac83d8 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -55,7 +55,7 @@ Sequence const & BibConfig::GetPropertyNames() } BibConfig::BibConfig() - : ConfigItem("Office.DataAccess/Bibliography", ConfigItemMode::DelayedUpdate) + : ConfigItem("Office.DataAccess/Bibliography", ConfigItemMode::NONE) , nTblOrQuery(0) , nBeamerSize(0) , nViewSize(0) diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 14bf94dc8177..675e9edfab24 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -44,8 +44,7 @@ namespace com{ namespace sun{ namespace star{ enum class ConfigItemMode { - ImmediateUpdate = 0x00, - DelayedUpdate = 0x01, + NONE = 0x00, AllLocales = 0x02, ReleaseTree = 0x04, }; @@ -111,7 +110,7 @@ namespace utl protected: explicit ConfigItem(const OUString &rSubTree, - ConfigItemMode nMode = ConfigItemMode::DelayedUpdate); + ConfigItemMode nMode = ConfigItemMode::NONE); void SetModified (); // mark item as modified void ClearModified(); // reset state after commit! diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx index ad62ac0c91bd..878eeb8fadaf 100644 --- a/svl/source/passwordcontainer/passwordcontainer.hxx +++ b/svl/source/passwordcontainer/passwordcontainer.hxx @@ -185,7 +185,7 @@ private: public: StorageItem( PasswordContainer* point, const OUString& path ) : - ConfigItem( path, ConfigItemMode::ImmediateUpdate ), + ConfigItem( path, ConfigItemMode::NONE ), mainCont( point ), hasEncoded( false ) { diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 74ef2d0b6950..f438b3db7338 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( "Office.Common/Passwords", ConfigItemMode::ImmediateUpdate ), +: utl::ConfigItem( "Office.Common/Passwords", ConfigItemMode::NONE ), m_bInited( false ), m_pOwner( pOwner ) { diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f1b03ea828ef..e788853b28f3 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -616,7 +616,7 @@ FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) - ,FmXFormShell_CFGBASE("Office.Common/Misc", ConfigItemMode::DelayedUpdate) + ,FmXFormShell_CFGBASE("Office.Common/Misc", ConfigItemMode::NONE) ,m_eNavigate( NavigationBarMode_NONE ) ,m_nInvalidationEvent( nullptr ) ,m_nActivationEvent( nullptr ) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 60759a3b37c0..c17fe4b078df 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -187,8 +187,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, const SwDBData& rData ) : SfxModalDialog(rView.GetWindow(), "InsertDbColumnsDialog", "modules/swriter/ui/insertdbcolumnsdialog.ui") - , ConfigItem("Office.Writer/InsertData/DataSet", - ConfigItemMode::DelayedUpdate) + , ConfigItem("Office.Writer/InsertData/DataSet", ConfigItemMode::NONE) , aDBData(rData) , sNoTmpl(SwResId(SW_STR_NONE)) , pView(&rView) diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx index 3dddef500eeb..20f99ce0aad6 100644 --- a/sw/source/uibase/config/barcfg.cxx +++ b/sw/source/uibase/config/barcfg.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::uno; SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) : ConfigItem(bWeb ? OUString("Office.WriterWeb/ObjectBar") : OUString("Office.Writer/ObjectBar"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) + ConfigItemMode::ReleaseTree) { for(int 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 34d0650dcde0..104b15192228 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -41,8 +41,7 @@ const Sequence& SwDBConfig::GetPropertyNames() } SwDBConfig::SwDBConfig() : - ConfigItem("Office.DataAccess", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) + ConfigItem("Office.DataAccess", ConfigItemMode::ReleaseTree) { }; diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 3d03b567aa76..78dbae70b85f 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -234,8 +234,7 @@ const Sequence& SwRevisionConfig::GetPropertyNames() } SwRevisionConfig::SwRevisionConfig() : - ConfigItem("Office.Writer/Revision", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) + ConfigItem("Office.Writer/Revision", ConfigItemMode::ReleaseTree) { m_aInsertAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE; m_aInsertAttr.m_nAttr = LINESTYLE_SINGLE; @@ -561,7 +560,7 @@ const Sequence& SwInsertConfig::GetPropertyNames() SwInsertConfig::SwInsertConfig(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Insert") : OUString("Office.Writer/Insert"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItemMode::ReleaseTree), m_bInsWithCaption( false ), m_bCaptionOrderNumberingFirst( false ), m_aInsTableOpts(SwInsertTableFlags::NONE,0), @@ -1082,7 +1081,7 @@ const Sequence& SwTableConfig::GetPropertyNames() SwTableConfig::SwTableConfig(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) + ConfigItemMode::ReleaseTree) , m_nTableHMove(0) , m_nTableVMove(0) , m_nTableHInsert(0) @@ -1151,8 +1150,7 @@ void SwTableConfig::Load() } SwMiscConfig::SwMiscConfig() : - ConfigItem("Office.Writer", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItem("Office.Writer", ConfigItemMode::ReleaseTree), m_bDefaultFontsInCurrDocOnly(false), m_bShowIndexPreview(false), m_bGrfToGalleryAsLnk(true), @@ -1267,8 +1265,7 @@ const Sequence& SwCompareConfig::GetPropertyNames() } SwCompareConfig::SwCompareConfig() : - ConfigItem("Office.Writer/Comparison", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) + ConfigItem("Office.Writer/Comparison", ConfigItemMode::ReleaseTree) ,m_bStoreRsid(true) { m_eCmpMode = SwCompareMode::Auto; diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index 1b54c1eccb39..7ded55bfa0de 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -64,7 +64,7 @@ Sequence SwPrintOptions::GetPropertyNames() SwPrintOptions::SwPrintOptions(bool bWeb) : ConfigItem(bWeb ? OUString("Office.WriterWeb/Print") : OUString("Office.Writer/Print"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItemMode::ReleaseTree), bIsWeb(bWeb) { m_bPrintPageBackground = !bWeb; diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 9c00526c29a3..26c81f745a45 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -262,7 +262,7 @@ Sequence SwLayoutViewConfig::GetPropertyNames() SwLayoutViewConfig::SwLayoutViewConfig(bool bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Layout") : OUString("Office.Writer/Layout"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItemMode::ReleaseTree), rParent(rPar), bWeb(bIsWeb) { @@ -398,7 +398,7 @@ Sequence SwGridConfig::GetPropertyNames() SwGridConfig::SwGridConfig(bool bIsWeb, SwMasterUsrPref& rPar) : ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Grid") : OUString("Office.Writer/Grid"), - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItemMode::ReleaseTree), rParent(rPar) { } @@ -482,8 +482,7 @@ Sequence SwCursorConfig::GetPropertyNames() } SwCursorConfig::SwCursorConfig(SwMasterUsrPref& rPar) : - ConfigItem("Office.Writer/Cursor", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItem("Office.Writer/Cursor", ConfigItemMode::ReleaseTree), rParent(rPar) { } @@ -545,8 +544,7 @@ void SwCursorConfig::Load() void SwCursorConfig::Notify( const css::uno::Sequence< OUString >& ) {} SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) : - ConfigItem("Office.WriterWeb/Background", - ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), + ConfigItem("Office.WriterWeb/Background", ConfigItemMode::ReleaseTree), rParent(rPar), aPropNames(1) { diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 6e6a6a4ccfe2..e42f6e774278 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", ConfigItemMode::ImmediateUpdate), + ConfigItem("Office.Writer/MailMergeWizard", ConfigItemMode::NONE), m_nResultSetCursorPos(-1), m_nCurrentAddressBlock(0), m_bIsAddressBlock(true), diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 959d96e1e49b..ca2e1dac0082 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -120,7 +120,7 @@ public: GlobalEventConfig_Impl::GlobalEventConfig_Impl() - : ConfigItem( "Office.Events/ApplicationEvents", ConfigItemMode::ImmediateUpdate ) + : ConfigItem( "Office.Events/ApplicationEvents", ConfigItemMode::NONE ) { // the supported event names for (const GlobalEventId id : o3tl::enumrange()) diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index ce8816f6da8b..6f531a3e1f00 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -45,7 +45,7 @@ SettingsConfigItem* SettingsConfigItem::get() } SettingsConfigItem::SettingsConfigItem() - : ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::DelayedUpdate ), + : ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::NONE ), m_aSettings( 0 ) { getValues(); diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index b252b43bcd72..2e65e4f42d64 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( SETTINGS_CONFIGNODE, - ConfigItemMode::DelayedUpdate ), + ConfigItemMode::NONE ), m_nSelectionTimeout( 3 ) { Sequence aKeys { SELECTION_PROPERTY }; -- cgit