cui/source/options/optsave.cxx | 11 +----------
include/svtools/restartdialog.hxx | 3 ---
svtools/source/dialogs/restartdialog.cxx | 3 ---
svtools/uiconfig/ui/restartdialog.ui | 19 ++-----------------
4 files changed, 3 insertions(+), 33 deletions(-)
New commits:
commit d795d147b644a9abdb9fb343dec5970e435b527b
Author: Justin Luth <jl...@mail.com>
AuthorDate: Thu Jul 20 06:04:11 2023 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Thu Jul 20 15:32:06 2023 +0200
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 <jl...@mail.com>
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;
}
diff --git a/include/svtools/restartdialog.hxx
b/include/svtools/restartdialog.hxx
index 89178ad26e36..7de336c13b90 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -62,9 +62,6 @@ enum RestartReason {
// For restructuring the Form menu,
// %PRODUCTNAME must be restarted:
RESTART_REASON_MSCOMPATIBLE_FORMS_MENU,
- // For the modified save settings to take effect,
- // %PRODUCTNAME must be restarted:
- RESTART_REASON_SAVE,
// To apply changes, %PRODUCTNAME,
// %PRODUCTNAME must be restarted:
RESTART_REASON_UI_CHANGE,
diff --git a/svtools/source/dialogs/restartdialog.cxx
b/svtools/source/dialogs/restartdialog.cxx
index e41ac165269d..8dc4357700ec 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -68,9 +68,6 @@ public:
case svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU:
reason_ = m_xBuilder->weld_widget("reason_mscompatible_formsmenu");
break;
- case svtools::RESTART_REASON_SAVE:
- reason_ = m_xBuilder->weld_widget("reason_save");
- break;
case svtools::RESTART_REASON_UI_CHANGE:
reason_ = m_xBuilder->weld_widget("reason_uichange");
break;
diff --git a/svtools/uiconfig/ui/restartdialog.ui
b/svtools/uiconfig/ui/restartdialog.ui
index 89fc4340533c..d6076a3fe01b 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -258,21 +258,6 @@
<property name="position">13</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="reason_save">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="label" translatable="yes"
context="restartdialog|reason_save">For the modified save settings to take
effect, %PRODUCTNAME must be restarted.</property>
- <property name="wrap">True</property>
- <property name="max-width-chars">50</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">14</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
@@ -284,7 +269,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">15</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -299,7 +284,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">16</property>
+ <property name="position">15</property>
</packing>
</child>
</object>
