diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-05-12 09:18:25 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-05-25 16:26:38 +0200 |
| commit | 323f2739e038d9b9753864989af03bf7f61cfc83 (patch) | |
| tree | 7ab52e9af5385378e7d437f2b6c3fdf77178c3ab /sfx2 | |
| parent | f48b5efa7a31bddfcaec6b5fc1a4217d35052c70 (diff) | |
jsdialog: sidebar: send sidebar Panels
Change-Id: Ia5a936c44e5d83fd4626098bcc027b0382523231
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116098
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Panel.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/PanelLayout.cxx | 3 |
3 files changed, 9 insertions, 2 deletions
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 <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/viewsh.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> +#include <vcl/jsdialog/executor.hxx> #include <vcl/window.hxx> #include <vcl/scrbar.hxx> @@ -309,6 +311,9 @@ sal_Int32 PlacePanels ( } } + if (comphelper::LibreOfficeKit::isActive()) + jsdialog::SendFullUpdate(reinterpret_cast<sal_uInt64>(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 <sfx2/sidebar/ResourceManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/SidebarPanelBase.hxx> +#include <sfx2/viewsh.hxx> #include <tools/json_writer.hxx> @@ -50,7 +51,7 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, Deck* pDeck, const std::function<Context()>& rContextAccess, const css::uno::Reference<css::frame::XFrame>& rxFrame) - : mxBuilder(Application::CreateBuilder(pParentWindow, "sfx/ui/panel.ui")) + : mxBuilder(Application::CreateBuilder(pParentWindow, "sfx/ui/panel.ui", false, reinterpret_cast<sal_uInt64>(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 <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/TabBar.hxx> #include <sfx2/sidebar/Theme.hxx> +#include <sfx2/viewsh.hxx> #include <vcl/event.hxx> 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<sal_uInt64>(SfxViewShell::Current()))) , m_xContainer(m_xBuilder->weld_container(rID)) , m_pPanel(nullptr) { |