include/svtools/restartdialog.hxx | 7 ++----- sc/source/ui/optdlg/tpcalc.cxx | 2 +- svtools/source/dialogs/restartdialog.cxx | 7 ++----- svtools/uiconfig/ui/restartdialog.ui | 19 ++----------------- 4 files changed, 7 insertions(+), 28 deletions(-)
New commits: commit ceb2254bb63422a70966178a536e583c64091943 Author: Sahil Gautam <[email protected]> AuthorDate: Wed Sep 24 13:11:08 2025 +0530 Commit: Sahil Gautam <[email protected]> CommitDate: Sat Oct 11 14:39:31 2025 +0200 tdf#151144 replace threading/opencl labels with a generic calculation label Change-Id: Ia23237f324e59a4ebee7b8fb17770856bb5d31ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191423 Reviewed-by: Sahil Gautam <[email protected]> Tested-by: Jenkins diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index a9b5f3743b41..564bd6c44d36 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -56,12 +56,9 @@ enum RestartReason { // For the Skia changes to take effect, // %PRODUCTNAME must be restarted: RESTART_REASON_SKIA, - // For the OpenCL changes to take effect, + // For the Calculation settings changes to take effect, // %PRODUCTNAME must be restarted: - RESTART_REASON_OPENCL, - // For the multi-threaded calculation changes to take effect, - // %PRODUCTNAME must be restarted: - RESTART_REASON_THREADING, + RESTART_REASON_CALCULATION, // To apply changes, %PRODUCTNAME, // %PRODUCTNAME must be restarted: RESTART_REASON_UI_CHANGE, diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index f55038d9d232..24b56c8f4b55 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -304,7 +304,7 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) SolarMutexGuard aGuard; if (svtools::executeRestartDialog( comphelper::getProcessComponentContext(), GetFrameWeld(), - svtools::RESTART_REASON_THREADING)) + svtools::RESTART_REASON_CALCULATION)) GetDialogController()->response(RET_OK); } if ( *pLocalOptions != *pOldOptions ) diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 791d67760f10..7e54e95bc914 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -62,11 +62,8 @@ public: case svtools::RESTART_REASON_SKIA: reason_ = m_xBuilder->weld_widget(u"reason_skia"_ustr); break; - case svtools::RESTART_REASON_OPENCL: - reason_ = m_xBuilder->weld_widget(u"reason_opencl"_ustr); - break; - case svtools::RESTART_REASON_THREADING: - reason_ = m_xBuilder->weld_widget(u"reason_threading"_ustr); + case svtools::RESTART_REASON_CALCULATION: + reason_ = m_xBuilder->weld_widget(u"reason_calculation"_ustr); break; case svtools::RESTART_REASON_UI_CHANGE: reason_ = m_xBuilder->weld_widget(u"reason_uichange"_ustr); diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui index d5636c67fbce..5233fdffe2eb 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -231,10 +231,10 @@ </packing> </child> <child> - <object class="GtkLabel" id="reason_opencl"> + <object class="GtkLabel" id="reason_calculation"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="label" translatable="yes" context="restartdialog|reason_opencl">For the OpenCL changes to take effect, %PRODUCTNAME must be restarted.</property> + <property name="label" translatable="yes" context="restartdialog|reason_calculation">For the Calculation settings changes 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> @@ -245,21 +245,6 @@ <property name="position">11</property> </packing> </child> - <child> - <object class="GtkLabel" id="reason_threading"> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="label" translatable="yes" context="restartdialog|reason_threading">For the multi-threaded calculation changes 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">12</property> - </packing> - </child> <child> <object class="GtkLabel" id="label"> <property name="visible">True</property>
