sc/uiconfig/scalc/ui/createnamesdialog.ui | 2 --
vcl/unx/gtk3/gtkframe.cxx | 2 +-
xmlsecurity/uiconfig/ui/certpage.ui | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 62539f7b7b6c67327dbe3d6d181c72cf4df3825d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 16:07:45 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 20:21:09 2022 +0100
gtk4: remove stray xalign
Change-Id: I6a54b1547dbf78ec285dee59893ed3a899285997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129152
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui
b/sc/uiconfig/scalc/ui/createnamesdialog.ui
index 70b7b51c3cde..4ab5ef8ccccb 100644
--- a/sc/uiconfig/scalc/ui/createnamesdialog.ui
+++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui
@@ -28,9 +28,7 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="xalign">0.5</property>
<property name="use-underline">True</property>
- <property name="yalign">0.5</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/xmlsecurity/uiconfig/ui/certpage.ui
b/xmlsecurity/uiconfig/ui/certpage.ui
index 6b2a12e64687..4e0579ac53e0 100644
--- a/xmlsecurity/uiconfig/ui/certpage.ui
+++ b/xmlsecurity/uiconfig/ui/certpage.ui
@@ -48,7 +48,6 @@
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</property>
</object>
<packing>
<property name="left_attach">0</property>
commit 52c22530ad3dc2b1156f7e0555b75b4aaeaf7cb0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 16:05:50 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 20:20:51 2022 +0100
gtk4: dlsym hack for gdk_wayland_window_set_application_id not needed
Change-Id: I66b6c0157759caf20df9af1642e0f5488d47dc22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129151
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 1c3daa45eab7..29d6c00f78d7 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1619,7 +1619,7 @@ void GtkSalFrame::Show( bool bVisible, bool
/*bNoActivate*/ )
m_pParent->addGrabLevel();
}
-#if defined(GDK_WINDOWING_WAYLAND)
+#if defined(GDK_WINDOWING_WAYLAND) && !GTK_CHECK_VERSION(4,0,0)
/*
rhbz#1334915, gnome#779143, tdf#100158
https://gitlab.gnome.org/GNOME/gtk/-/issues/767
