include/svtools/restartdialog.hxx | 3 ---
solenv/sanitizers/ui/svt.suppr | 1 -
svtools/source/dialogs/restartdialog.cxx | 3 ---
svtools/uiconfig/ui/restartdialog.ui | 15 ---------------
4 files changed, 22 deletions(-)
New commits:
commit da5cf5598ad9e1594f8257aa3faeece0b342cbfa
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 3 09:23:44 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 3 10:23:22 2020 +0200
RESTART_REASON_OPENGL is dead
since
commit 9dc7b88f5d3a3af0307b4ae39a01247677907d80
Date: Mon May 4 11:50:03 2020 +0200
remove checkboxes for enabling OpenGL
Change-Id: I0b787d6d3ea235fa75b537c90b1d9e74837647c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97811
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svtools/restartdialog.hxx
b/include/svtools/restartdialog.hxx
index ad1f4859d32b..9147b005d220 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -54,9 +54,6 @@ enum RestartReason {
// "For the extension to work properly,
// %PRODUCTNAME must be restarted.":
RESTART_REASON_EXTENSION_INSTALL,
- // For the OpenGL changes to take effect,
- // %PRODUCTNAME must be restarted:
- RESTART_REASON_OPENGL,
// For the Skia changes to take effect,
// %PRODUCTNAME must be restarted:
RESTART_REASON_SKIA,
diff --git a/solenv/sanitizers/ui/svt.suppr b/solenv/sanitizers/ui/svt.suppr
index e15630b0015c..3981518c1988 100644
--- a/solenv/sanitizers/ui/svt.suppr
+++ b/solenv/sanitizers/ui/svt.suppr
@@ -23,7 +23,6 @@
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_adding_path'] orphan
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_language_change']
orphan-label
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_exp_features']
orphan-label
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_extension_install']
orphan-label
-svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_opengl']
orphan-label
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='reason_skia'] orphan-label
svtools/uiconfig/ui/restartdialog.ui://GtkLabel[@id='label'] orphan-label
svtools/uiconfig/ui/spinfieldcontrol.ui://GtkSpinButton[@id='spinbutton']
no-labelled-by
diff --git a/svtools/source/dialogs/restartdialog.cxx
b/svtools/source/dialogs/restartdialog.cxx
index 419b0e55da93..dbe85f95eb48 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -59,9 +59,6 @@ public:
case svtools::RESTART_REASON_EXTENSION_INSTALL:
reason_ = m_xBuilder->weld_widget("reason_extension_install");
break;
- case svtools::RESTART_REASON_OPENGL:
- reason_ = m_xBuilder->weld_widget("reason_opengl");
- break;
case svtools::RESTART_REASON_SKIA:
reason_ = m_xBuilder->weld_widget("reason_skia");
break;
diff --git a/svtools/uiconfig/ui/restartdialog.ui
b/svtools/uiconfig/ui/restartdialog.ui
index 6f66108db398..db3a479492b6 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -213,21 +213,6 @@
<property name="position">9</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="reason_opengl">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes"
context="restartdialog|reason_opengl">For the OpenGL 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">10</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="reason_opencl">
<property name="can_focus">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
