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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 17 14:28:30 UTC 2021


 vcl/unx/gtk4/convert3to4.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5e928d5fb9db23e21fbf0d9e5529bce308db531
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 17 12:23:51 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 17 16:27:41 2021 +0200

    gtk4: extend workaround for ampersand in paragraph dialog notebook labels
    
    Change-Id: Ib165f1ab1173f7bb6500d5dfff5f82e4216d9f42
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117380
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 0fdbdb7e6a93..9d5a4b7b12f6 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1343,7 +1343,7 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
     // https://gitlab.gnome.org/GNOME/gtk/-/issues/4041 double encode ampersands if use-underline is used
     if (gtk_check_version(4, 3, 2) != nullptr)
     {
-        if (xPropertyLabel && bUseUnderline)
+        if (xPropertyLabel)
         {
             auto xLabelText = xPropertyLabel->getFirstChild();
             if (xLabelText.is())


More information about the Libreoffice-commits mailing list