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 /sd/source | |
| 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 'sd/source')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 01165afaecd7..692b3d73ef64 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/presentation/SlideShow.hpp> #include <com/sun/star/media/XPlayer.hpp> -#include <officecfg/Office/Common.hxx> +#include <officecfg/Office/Recovery.hxx> #include <svl/stritem.hxx> #include <svl/urihelper.hxx> #include <basic/sbstar.hxx> @@ -530,7 +530,7 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, maInputFreezeTimer.SetTimeout( 20 ); // no autosave during show - if( officecfg::Office::Common::Save::Document::AutoSave::get() ) + if (officecfg::Office::Recovery::AutoSave::Enabled::get()) mbAutoSaveWasOn = true; Application::AddEventListener( LINK( this, SlideshowImpl, EventListenerHdl ) ); |