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

[Libreoffice Gerrit user]

 include/vcl/weld.hxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8a5f6a0cbf04d9ffc8d0a50366f33662ac7252ec
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 11 11:41:17 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 11 14:38:23 2018 +0200

    forward to treeview
    
    Change-Id: Icd0f854ee9480f98684f8254a542b671c12960d1
    Reviewed-on: https://gerrit.libreoffice.org/61662
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index b7f39954be2c..ec9c83c1b6fa 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -708,7 +708,10 @@ public:
         if (!bKeepExisting)
             m_xTreeView->clear();
         for (const auto& rItem : rItems)
-            m_xTreeView->insert(-1, rItem.sString, &rItem.sId, &rItem.sImage, nullptr);
+        {
+            m_xTreeView->insert(-1, rItem.sString, rItem.sId.isEmpty() ? nullptr : &rItem.sId,
+                                rItem.sImage.isEmpty() ? nullptr : &rItem.sImage, nullptr);
+        }
         m_xTreeView->thaw();
     }