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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk4/convert3to4.cxx |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit 8f4ca55bcea5234aa4979e526c06a64f71b56042
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Sep 13 17:03:43 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 13 20:48:29 2022 +0200

    drop gtk_check_version(4, 3, 2) checks now
    
    Change-Id: Ifaa909f8f1ffc5f6d012769e7fba3a6cab403273
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139871
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 2c1554669119..d7d348029c9d 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1519,22 +1519,6 @@ ConvertResult Convert3To4(const 
css::uno::Reference<css::xml::dom::XNode>& xNode
     for (auto& xRemove : xRemoveList)
         xNode->removeChild(xRemove);
 
-    // 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)
-        {
-            auto xLabelText = xPropertyLabel->getFirstChild();
-            if (xLabelText.is())
-            {
-                OString sText = xLabelText->getNodeValue().toUtf8();
-                gchar* pText = g_markup_escape_text(sText.getStr(), 
sText.getLength());
-                xLabelText->setNodeValue(OUString(pText, strlen(pText), 
RTL_TEXTENCODING_UTF8));
-                g_free(pText);
-            }
-        }
-    }
-
     return ConvertResult(bChildCanFocus, bHasVisible, bHasIconSize, 
bAlwaysShowImage, bUseUnderline,
                          bVertOrientation, bXAlign, eImagePos, xPropertyLabel, 
xPropertyIconName);
 }