Kaydet (Commit) 67ff7348 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused ConfigItemMode::DelayedUpdate

unused ever since

    commit c1758889
    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: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 1e6cc2c8
......@@ -36,7 +36,7 @@ namespace dxcanvas
DXCanvasItem::DXCanvasItem() :
ConfigItem(
"Office.Canvas/DXCanvas",
ConfigItemMode::ImmediateUpdate ),
ConfigItemMode::NONE ),
maValues(),
maMaxTextureSize(),
mbBlacklistCurrentDevice(false),
......
......@@ -55,7 +55,7 @@ Sequence<OUString> const & BibConfig::GetPropertyNames()
}
BibConfig::BibConfig()
: ConfigItem("Office.DataAccess/Bibliography", ConfigItemMode::DelayedUpdate)
: ConfigItem("Office.DataAccess/Bibliography", ConfigItemMode::NONE)
, nTblOrQuery(0)
, nBeamerSize(0)
, nViewSize(0)
......
......@@ -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!
......
......@@ -185,7 +185,7 @@ private:
public:
StorageItem( PasswordContainer* point, const OUString& path ) :
ConfigItem( path, ConfigItemMode::ImmediateUpdate ),
ConfigItem( path, ConfigItemMode::NONE ),
mainCont( point ),
hasEncoded( false )
{
......
......@@ -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 )
{
......
......@@ -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 )
......
......@@ -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)
......
......@@ -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;
......
......@@ -41,8 +41,7 @@ const Sequence<OUString>& SwDBConfig::GetPropertyNames()
}
SwDBConfig::SwDBConfig() :
ConfigItem("Office.DataAccess",
ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
ConfigItem("Office.DataAccess", ConfigItemMode::ReleaseTree)
{
};
......
......@@ -234,8 +234,7 @@ const Sequence<OUString>& 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<OUString>& 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<OUString>& 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<OUString>& 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;
......
......@@ -64,7 +64,7 @@ Sequence<OUString> 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;
......
......@@ -262,7 +262,7 @@ Sequence<OUString> 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<OUString> 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<OUString> 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)
{
......
......@@ -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),
......
......@@ -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<GlobalEventId>())
......
......@@ -45,7 +45,7 @@ SettingsConfigItem* SettingsConfigItem::get()
}
SettingsConfigItem::SettingsConfigItem()
: ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::DelayedUpdate ),
: ConfigItem( SETTINGS_CONFIGNODE, ConfigItemMode::NONE ),
m_aSettings( 0 )
{
getValues();
......
......@@ -67,7 +67,7 @@ sal_Int32 SelectionManager::getSelectionTimeout()
DtransX11ConfigItem::DtransX11ConfigItem() :
ConfigItem( SETTINGS_CONFIGNODE,
ConfigItemMode::DelayedUpdate ),
ConfigItemMode::NONE ),
m_nSelectionTimeout( 3 )
{
Sequence<OUString> aKeys { SELECTION_PROPERTY };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment