[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source

[Szymon Kłos (via logerrit)]

 vcl/source/treelist/svtabbx.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 0ae6d51e720ea66ef6efb52d0d96f8a5fb60b595
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Jan 4 15:28:34 2023 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Jan 4 18:31:13 2023 +0000

    jsdialog: don't export collapsed/expanded icons when empty
    
    Change-Id: Iec56c11fdba066f9b62b2d5d56ad011a821e4087
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145040
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 9d989eb8382d..ccc5c1cd2491 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -75,9 +75,16 @@ static void lcl_DumpEntryAndSiblings(tools::JsonWriter& 
rJsonWriter,
                     const SvLBoxContextBmp* pBmpItem = dynamic_cast<const 
SvLBoxContextBmp*>(&rItem);
                     if (pBmpItem)
                     {
-                        auto aColumn = rJsonWriter.startStruct();
-                        rJsonWriter.put("collapsed", 
pBmpItem->GetBitmap1().GetStock());
-                        rJsonWriter.put("expanded", 
pBmpItem->GetBitmap2().GetStock());
+                        const OUString& rCollapsed = 
pBmpItem->GetBitmap1().GetStock();
+                        const OUString& rExpanded = 
pBmpItem->GetBitmap2().GetStock();
+                        if (!rCollapsed.trim().isEmpty() || 
!rExpanded.trim().isEmpty())
+                        {
+                            auto aColumn = rJsonWriter.startStruct();
+                            if (!rCollapsed.trim().isEmpty())
+                                rJsonWriter.put("collapsed", rCollapsed);
+                            if (!rExpanded.trim().isEmpty())
+                                rJsonWriter.put("expanded", rExpanded);
+                        }
                     }
                 }
             }