svx/source/dialog/ThemeDialog.cxx | 4 +++-
svx/uiconfig/ui/themedialog.ui | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6696854514eaf06c07171ebb56ab58765275e4f3
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu Apr 27 20:31:05 2023 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Thu Apr 27 20:36:37 2023 +0900
disable dbl-click in ThemeDialog in LOK, remove the dialog size
The double click in THemeDialog exits the dialog automatically,
but this causes a crash in online, so disable it there.
No need to set the theme dialog size to a certain fixed value so
we don't add white space.
Change-Id: I555a631b7d0c515ec326c3654138982c59d3f021
diff --git a/svx/source/dialog/ThemeDialog.cxx
b/svx/source/dialog/ThemeDialog.cxx
index c440292b723d..01f88fa036ed 100644
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@@ -15,6 +15,7 @@
#include <svx/ColorSets.hxx>
#include <vcl/svapp.hxx>
#include <svx/colorbox.hxx>
+#include <comphelper/lok.hxx>
namespace svx
{
@@ -65,7 +66,8 @@ void ThemeDialog::initColorSets()
IMPL_LINK_NOARG(ThemeDialog, DoubleClickValueSetHdl, ValueSet*, void)
{
SelectItem(nullptr);
- m_xDialog->response(RET_OK);
+ if (!comphelper::LibreOfficeKit::isActive())
+ m_xDialog->response(RET_OK);
}
IMPL_LINK_NOARG(ThemeDialog, SelectItem, ValueSet*, void)
diff --git a/svx/uiconfig/ui/themedialog.ui b/svx/uiconfig/ui/themedialog.ui
index 80bbcc5fca67..6895f51dff24 100644
--- a/svx/uiconfig/ui/themedialog.ui
+++ b/svx/uiconfig/ui/themedialog.ui
@@ -3,8 +3,6 @@
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="ThemeDialog">
- <property name="width-request">640</property>
- <property name="height-request">480</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
