[Libreoffice-commits] core.git: 2 commits - sc/source svx/source vcl/source

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/cctrl/cbnumberformat.cxx       |    2 +-
 svx/source/tbxctrls/StylesPreviewWindow.cxx |    2 +-
 vcl/source/window/toolbox2.cxx              |   13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 9dd28785c7d0d1604c85e00247782e1ebd2d69f8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Apr 28 15:20:35 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Jul 19 09:01:25 2021 +0200

    jsdialog: dump toolbox item's window if present
    
    Change-Id: Ia882bcadb844993f2b761bd91c6f6f60c9e1b2ee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114807
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119016
    Tested-by: Jenkins

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 291cad218c37..c7c1934270d5 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1739,11 +1739,16 @@ void ToolBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
         auto childrenNode = rJsonWriter.startArray("children");
         for (ToolBox::ImplToolItems::size_type i = 0; i < GetItemCount(); ++i)
         {
-            ToolBoxItemType type = GetItemType(i);
-            if (type == ToolBoxItemType::BUTTON)
+            auto childNode = rJsonWriter.startStruct();
+            ToolBoxItemId nId = GetItemId(i);
+
+            vcl::Window* pWindow = GetItemWindow(nId);
+            if (pWindow)
+            {
+                pWindow->DumpAsPropertyTree(rJsonWriter);
+            }
+            else
             {
-                auto childNode = rJsonWriter.startStruct();
-                ToolBoxItemId nId = GetItemId(i);
                 if (!IsItemVisible(nId))
                     continue;
                 rJsonWriter.put("type", "toolitem");
commit 37192a6f87a82e83eab03c06258d455f16694154
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Apr 28 13:48:08 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Jul 19 09:01:10 2021 +0200

    notebookbar: fix welded controls in online
    
    Additional parameter was introduced for InterimItemWindow
    and value for it was missing.
    
    Change-Id: I9dad0e4d60205db0c8cabfcf5c98fabc2d8fdefe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114801
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119015
    Tested-by: Jenkins

diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx
index 32bc0d76d0e1..29ab64e84e75 100644
--- a/sc/source/ui/cctrl/cbnumberformat.cxx
+++ b/sc/source/ui/cctrl/cbnumberformat.cxx
@@ -27,7 +27,7 @@
 #include <sc.hrc>
 
 ScNumberFormat::ScNumberFormat(vcl::Window* pParent)
-    : InterimItemWindow(pParent, "modules/scalc/ui/numberbox.ui", "NumberBox",
+    : InterimItemWindow(pParent, "modules/scalc/ui/numberbox.ui", "NumberBox", true,
                         reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))
     , m_xWidget(m_xBuilder->weld_combo_box("numbertype"))
 {
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index eef8bba791e5..2051e2479a84 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -479,7 +479,7 @@ void StylesPreviewWindow_Base::UpdateStylesList()
 StylesPreviewWindow_Impl::StylesPreviewWindow_Impl(
     vcl::Window* pParent, std::vector<std::pair<OUString, OUString>>& aDefaultStyles,
     const css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider)
-    : InterimItemWindow(pParent, "svx/ui/stylespreview.ui", "ApplyStyleBox",
+    : InterimItemWindow(pParent, "svx/ui/stylespreview.ui", "ApplyStyleBox", true,
                         reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))
     , StylesPreviewWindow_Base(*m_xBuilder, aDefaultStyles, xDispatchProvider)
 {