[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed May 26 16:40:11 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 05064808c90ce5598c3cfe47dd284388908d4553
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 26 16:27:20 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 26 18:39:24 2021 +0200

    gtk4: strip GtkLinkButton xalign
    
    Change-Id: I44065da82f577e226ee1c52f858917a1d825d9ce
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116200
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b8f90f0103eb..d4e9465b8248 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -18583,6 +18583,15 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode)
                 }
             }
 
+            if (sName == "xalign")
+            {
+                if (GetParentObjectType(xChild) == "GtkLinkButton")
+                {
+                    // TODO expand into a GtkLabel child with alignment on that instead
+                    assert(xChild->getFirstChild()->getNodeValue() == "0");
+                    xRemoveList.push_back(xChild);
+                }
+            }
 
             if (sName == "image")
             {


More information about the Libreoffice-commits mailing list