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

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/cctrl/cbnumberformat.cxx       |    2 +-
 svx/source/tbxctrls/StylesPreviewWindow.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20cba8366bc580356f63e31e3fd68d2fa7583062
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: Thu Apr 29 09:52:44 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>

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 312d849800c1..a4b937eb6790 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -491,7 +491,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)
 {