diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-09-13 17:03:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-09-13 20:48:29 +0200 |
| commit | 8f4ca55bcea5234aa4979e526c06a64f71b56042 (patch) | |
| tree | 2f03c0db2082df85f4af6596fcdaa5add7c254dd /vcl | |
| parent | 583ea856f2aa227bb04581c5bcdc3a402f5a184f (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk4/convert3to4.cxx | 16 |
1 files changed, 0 insertions, 16 deletions
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); } |