diff options
| author | Justin Luth <jluth@mail.com> | 2023-07-20 06:04:11 -0400 |
|---|---|---|
| committer | Justin Luth <jluth@mail.com> | 2023-07-20 15:32:06 +0200 |
| commit | d795d147b644a9abdb9fb343dec5970e435b527b (patch) | |
| tree | 49d7d47e213ecc0a182cde1f07f0d90fa104d9e6 /cui | |
| parent | 46ef53f8ab839f659892589cbd7d143beb3eea9f (diff) | |
Revert "tdf#149401 show "Restart LibreOffice" dialog changing AutoRecovery"
This reverts 7.4 commit 18cc891483fef63ad168273658a30bff72b87a95.
The bits are no longer used because all options in this dialog
apply immediately, thanks to tdf#65509 and even more so tdf#156308
(which are API changes that won't be backported - so 24.2+ only).
I didn't see any other option in this dialog that could have
benefitted from a restart request, and the scope of this
dialog is rather small, so no value in ignoring the dead code.
Change-Id: I3f40421af079fd42c10d6862949279328ef5583b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154669
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optsave.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index d7cbd61b366d..b257c43fa820 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -38,7 +38,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <sfx2/sfxsids.hrc> #include <sfx2/docfilt.hxx> -#include <svtools/restartdialog.hxx> #include <unotools/optionsdlg.hxx> #include <osl/diagnose.h> #include <comphelper/diagnose_ex.hxx> @@ -239,7 +238,7 @@ void SvxSaveTabPage::DetectHiddenControls() bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet ) { auto xChanges = comphelper::ConfigurationChanges::create(); - bool bModified = false, bRequestRestart = false; + bool bModified = false; if (m_xLoadViewPosAnyUserCB->get_state_changed_from_saved()) { officecfg::Office::Common::Load::ViewPositionForAnyUser::set(m_xLoadViewPosAnyUserCB->get_active(), xChanges); @@ -348,14 +347,6 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet ) aModuleOpt.SetFactoryDefaultFilter(SvtModuleOptions::EFactory::WRITERGLOBAL, pImpl->aDefaultArr[APP_WRITER_GLOBAL]); xChanges->commit(); - - if (bRequestRestart) - { - OfaTreeOptionsDialog* pParentDlg(static_cast<OfaTreeOptionsDialog*>(GetDialogController())); - if (pParentDlg) - pParentDlg->SetNeedsRestart(svtools::RESTART_REASON_SAVE); - } - return bModified; } |