From 323f2739e038d9b9753864989af03bf7f61cfc83 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Wed, 12 May 2021 09:18:25 +0200 Subject: jsdialog: sidebar: send sidebar Panels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia5a936c44e5d83fd4626098bcc027b0382523231 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116098 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos --- sfx2/source/sidebar/DeckLayouter.cxx | 5 +++++ sfx2/source/sidebar/Panel.cxx | 3 ++- sfx2/source/sidebar/PanelLayout.cxx | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 36d6357ef305..9a758f1f7215 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -25,9 +25,11 @@ #include #include #include +#include #include #include +#include #include #include @@ -309,6 +311,9 @@ sal_Int32 PlacePanels ( } } + if (comphelper::LibreOfficeKit::isActive()) + jsdialog::SendFullUpdate(reinterpret_cast(SfxViewShell::Current()), "Panel"); + return nY; } diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 471a5f2b9507..d49f93c06659 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -50,7 +51,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, Deck* pDeck, const std::function& rContextAccess, const css::uno::Reference& rxFrame) - : mxBuilder(Application::CreateBuilder(pParentWindow, "sfx/ui/panel.ui")) + : mxBuilder(Application::CreateBuilder(pParentWindow, "sfx/ui/panel.ui", false, reinterpret_cast(SfxViewShell::Current()))) , msPanelId(rPanelDescriptor.msId) , msTitle(rPanelDescriptor.msTitle) , mbIsTitleBarOptional(rPanelDescriptor.mbIsTitleBarOptional) diff --git a/sfx2/source/sidebar/PanelLayout.cxx b/sfx2/source/sidebar/PanelLayout.cxx index 271f4d8a6c36..fb7e5a48c2a2 100644 --- a/sfx2/source/sidebar/PanelLayout.cxx +++ b/sfx2/source/sidebar/PanelLayout.cxx @@ -12,12 +12,13 @@ #include #include #include +#include #include using namespace sfx2::sidebar; PanelLayout::PanelLayout(weld::Widget* pParent, const OString& rID, const OUString& rUIXMLDescription) - : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription)) + : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription, false, reinterpret_cast(SfxViewShell::Current()))) , m_xContainer(m_xBuilder->weld_container(rID)) , m_pPanel(nullptr) { -- cgit