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

[Michael Meeks (via logerrit)]

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

New commits:
commit 7d722e6d9809959a2f48a456d157882b7f1778d8
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Feb 15 21:31:19 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Feb 18 10:36:18 2020 +0100

    jsdialog: don't report hidden toolbox items as present.
    
    Change-Id: I965d41b15c437965b605e70b228f4da6ccbeb857
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88766
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit cb3f23082e74c291720c8cd56f23e9d752b6fe76)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88796
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 92b54e661b96..ade4c3360df8 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1808,6 +1808,8 @@ boost::property_tree::ptree ToolBox::DumpAsPropertyTree()
             {
                 boost::property_tree::ptree aEntry;
                 int nId = GetItemId(i);
+                if (!IsItemVisible(nId))
+                    continue;
                 aEntry.put("type", "toolitem");
                 aEntry.put("text", GetItemText(nId));
                 aEntry.put("command", GetItemCommand(nId));