diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-07-16 18:17:21 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-07-17 21:14:24 +0200 |
| commit | 3c41b32562d5ccdd306000484c5b16245b2b4a4f (patch) | |
| tree | bef39fbfb1b98655e5ad700a74ecdb8535bbe378 /cui | |
| parent | 71f2aea3151b82ba4793eb21a2251d587e425511 (diff) | |
tdf#156308: Restore use of /org.openoffice.Office.Recovery/AutoSave
... instead of respective values from /org.openoffice.Office.Common/Save/Document
The history of the problem:
d0f9685d2cfc3927add412b276c804dcc20cb6a5 (2004-11-26)
made SvtSaveOptions use org.openoffice.Office.Recovery/AutoSave,
*in addition* to org.openoffice.Office.Common/Save/Document/*,
as "forward AutoSave/AutoSaveTime to new config location" part
of i#27726; at this point, org.openoffice.Office.Recovery/AutoSave/*
took precedence (they were read last).
8e6031e126782ced6d7527b19cf817395e9b63e4 (2004-11-26)
implemented autorecovery.cxx, already reading
org.openoffice.Office.Recovery/AutoSave/*
d5b9283985633fdb423269cab961bba2acc3539e (2021-07-25)
made SvxSaveTabPage and SfxApplication::SetOptions_Impl use
officecfg::Office::Common::Save::Document::* instead of
SvtSaveOptions.
134f40136a9bea265d8f2fedfdb41a1e65d81b49 (2021-07-25)
dropped SvtSaveOptions_Impl::ImplCommit, and its saving of
officecfg::Office::Recovery::AutoSave::* (which likely
detached officecfg::Office::Recovery::AutoSave from
officecfg::Office::Common::Save::Document, making UI edits
not stored to the former).
aeb8a0076cd5ec2836b3dfc1adffcced432f995f (2022-05-23)
made AutoRecovery::implts_readAutoSaveConfig read
officecfg::Office::Common::Save::Document::* instead of
proper officecfg::Office::Recovery::AutoSave::*.
This change restores the intended use, and deprecates corresponding
values in /org.openoffice.Office.Common/Save/Document.
Change-Id: I33d48e3945326c80d356bfc930ed8a7f042c982b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154500
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optsave.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 2772c6d60944..743c6015b1d5 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -475,8 +475,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) m_xBackupCB->set_active(officecfg::Office::Common::Save::Document::CreateBackup::get()); m_xBackupCB->set_sensitive(!officecfg::Office::Common::Save::Document::CreateBackup::isReadOnly()); - m_xAutoSaveCB->set_active(officecfg::Office::Common::Save::Document::AutoSave::get()); - m_xAutoSaveCB->set_sensitive(!officecfg::Office::Common::Save::Document::AutoSave::isReadOnly()); + m_xAutoSaveCB->set_active(officecfg::Office::Recovery::AutoSave::Enabled::get()); + m_xAutoSaveCB->set_sensitive(!officecfg::Office::Recovery::AutoSave::Enabled::isReadOnly()); m_xUserAutoSaveCB->set_active(officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::get()); m_xUserAutoSaveCB->set_sensitive(!officecfg::Office::Recovery::AutoSave::UserAutoSaveEnabled::isReadOnly()); @@ -484,8 +484,8 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) m_xWarnAlienFormatCB->set_active(officecfg::Office::Common::Save::Document::WarnAlienFormat::get()); m_xWarnAlienFormatCB->set_sensitive(!officecfg::Office::Common::Save::Document::WarnAlienFormat::isReadOnly()); - m_xAutoSaveEdit->set_value(officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::get()); - m_xAutoSaveEdit->set_sensitive(!officecfg::Office::Common::Save::Document::AutoSaveTimeIntervall::isReadOnly()); + m_xAutoSaveEdit->set_value(officecfg::Office::Recovery::AutoSave::TimeIntervall::get()); + m_xAutoSaveEdit->set_sensitive(!officecfg::Office::Recovery::AutoSave::TimeIntervall::isReadOnly()); // save relatively m_xRelativeFsysCB->set_active(officecfg::Office::Common::Save::URL::FileSystem::get()); |