summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2023-01-04 15:28:34 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2023-01-09 14:14:47 +0000
commitaff880740311e37740b8b0231bb7a7947ad922d7 (patch)
tree633b97ae246ccede268bb9a09e53d8639e89af48 /vcl
parentdd775cd630c907bc7d8bcd6f57ffd3f66115a5ba (diff)
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 <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145066 Tested-by: Jenkins
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/treelist/svtabbx.cxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index f766cde70559..9ef0e145ed6d 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);
+ }
}
}
}