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

[Szymon KÅ‚os (via logerrit)]

 vcl/source/window/toolbox2.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0e905534b25956d133d49dba6eafb48805140e6a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jul 6 18:21:21 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Jul 6 19:12:42 2021 +0200

    jsdialog: don't dump images for all toolitems
    
    Change-Id: I64d9e8a69a8e03c2e3561f251d3cf4c04a2609a4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118525
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 2781c3897063..4538fcf23e58 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1749,9 +1749,10 @@ void ToolBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
             }
             else
             {
+                OUString sCommand = GetItemCommand(nId);
                 rJsonWriter.put("type", "toolitem");
                 rJsonWriter.put("text", GetItemText(nId));
-                rJsonWriter.put("command", GetItemCommand(nId));
+                rJsonWriter.put("command", sCommand);
                 if (!IsItemVisible(nId))
                     rJsonWriter.put("visible", false);
                 if (GetItemBits(nId) & ToolBoxItemBits::DROPDOWN)
@@ -1760,7 +1761,7 @@ void ToolBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
                     rJsonWriter.put("enabled", false);
 
                 Image aImage = GetItemImage(nId);
-                if (!!aImage)
+                if (!sCommand.startsWith(".uno:") && !!aImage)
                 {
                     SvMemoryStream aOStm(6535, 6535);
                     if(GraphicConverter::Export(aOStm, aImage.GetBitmapEx(), ConvertDataFormat::PNG) == ERRCODE_NONE)