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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk4/convert3to4.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit a73969240d49b745359dcafdd7719bff0f4f4871
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 17 12:18:43 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 17 16:27:05 2021 +0200

    gtk4: no need for ampersand workaround in an empty label
    
    Change-Id: I7e1327303589cc9c2bb24b72d5cac92ff0fc0bfb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117379
    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 0e8c697ee753..0fdbdb7e6a93 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1345,11 +1345,14 @@ ConvertResult Convert3To4(const css::uno::Reference<css::xml::dom::XNode>& xNode
     {
         if (xPropertyLabel && bUseUnderline)
         {
-            OString sText = xPropertyLabel->getFirstChild()->getNodeValue().toUtf8();
-            gchar* pText = g_markup_escape_text(sText.getStr(), sText.getLength());
-            xPropertyLabel->getFirstChild()->setNodeValue(
-                OUString(pText, strlen(pText), RTL_TEXTENCODING_UTF8));
-            g_free(pText);
+            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);
+            }
         }
     }