include/sfx2/sfxsids.hrc | 1 - officecfg/registry/schema/org/openoffice/Office/Common.xcs | 9 --------- sfx2/source/appl/appcfg.cxx | 8 -------- 3 files changed, 18 deletions(-)
New commits: commit 5aa4ec482cf9ebb22571b1e5e8af0ff46d6ad3eb Author: Justin Luth <jl...@mail.com> AuthorDate: Mon Jul 17 20:19:22 2023 -0400 Commit: Justin Luth <jl...@mail.com> CommitDate: Tue Jul 18 14:04:06 2023 +0200 [API CHANGE] Drop unused AutoSavePrompt config key Never been used since prior to 2004 AFAICS git grep -i -C20 "auto.*save.*prompt" A git log -S AutoSavePrompt indicates that a seemingly superfluous use of it was removed with commit 1507e3b63b80b541a241d0ce1c977abb45cbeef8 Author: Rüdiger Timm on Fri Nov 26 13:37:09 2004 +0000 INTEGRATION: CWS recovery04 (1.52.36); FILE MERGED and the superfluous function itself was removed with commit 36a665a6754bbc4bb0a2d612a15b1b8413af3721 Author: Caolán McNamara on Wed Jul 27 22:09:03 2011 +0100 callcatcher: remove various unused methods This was probably all obsoleted by // functionality moved to new AutoRecovery Service! Change-Id: Iedc48a1913a09f8c22a4476f2e8441cff448f06b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154568 Tested-by: Jenkins Reviewed-by: Justin Luth <jl...@mail.com> diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index f21e1141bce7..86dccda1d4eb 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -527,7 +527,6 @@ class SvxZoomItem; #define SID_ATTR_DOCINFO TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 0) #define SID_ATTR_BACKUP TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 1) #define SID_ATTR_AUTOSAVE TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 2) -#define SID_ATTR_AUTOSAVEPROMPT TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 3) #define SID_ATTR_USERAUTOSAVE TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 4) #define SID_ATTR_AUTOSAVEMINUTE TypedWhichId<SfxUInt16Item>(SID_OPTIONS_START + 5) #define SID_ATTR_WORKINGSET TypedWhichId<SfxBoolItem>(SID_OPTIONS_START + 13) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 2219c4353faa..2e13f32a1fb3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2073,15 +2073,6 @@ </info> <value>false</value> </prop> - <prop oor:name="AutoSavePrompt" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools Options - General Save - [Section] Save --> - <info> - <desc>Shows a prompt during AutoSave,even when the document has a - filename.</desc> - <label>Prompt to save</label> - </info> - <value>true</value> - </prop> <prop oor:name="AutoSaveTimeIntervall" oor:type="xs:int" oor:nillable="false"> <info> <deprecated>Not used anymore</deprecated> diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 681d4e2bd576..8b622f6b3e04 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -163,10 +163,6 @@ void SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = toSet_ifRW<officecfg::Office::Recovery::AutoSave::Enabled>( rSet, SID_ATTR_AUTOSAVE); break; - case SID_ATTR_AUTOSAVEPROMPT: - bRet = toSet_ifRW<officecfg::Office::Common::Save::Document::AutoSavePrompt>( - rSet, SID_ATTR_AUTOSAVEPROMPT); - break; case SID_ATTR_AUTOSAVEMINUTE: bRet = toSet_ifRW<officecfg::Office::Recovery::AutoSave::TimeIntervall>( rSet, SID_ATTR_AUTOSAVEMINUTE); @@ -343,10 +339,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) // AutoSave toCfg_ifSet<officecfg::Office::Recovery::AutoSave::Enabled>(rSet, SID_ATTR_AUTOSAVE, batch); - // AutoSave-Prompt - toCfg_ifSet<officecfg::Office::Common::Save::Document::AutoSavePrompt>( - rSet, SID_ATTR_AUTOSAVEPROMPT, batch); - // AutoSave-Time toCfg_ifSet<officecfg::Office::Recovery::AutoSave::TimeIntervall>( rSet, SID_ATTR_AUTOSAVEMINUTE, batch);