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-07-27 09:43:08 +0200 |
| commit | 457649d02f23446ed2d28433a5aedecf6a49aed7 (patch) | |
| tree | ecd027e9b395de18aabaa7a8ceafc2938c117d41 /sfx2 | |
| parent | b17180a84cb4561b8a7bbf9e2281c91fffd56f87 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119511
Tested-by: Jenkins
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Panel.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/PanelLayout.cxx | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c60549e5d65e..54f100cd71a8 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -25,6 +25,7 @@ #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> @@ -35,6 +36,8 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XSidebarPanel.hpp> +#include <vcl/jsdialog/executor.hxx> + using namespace css; using namespace css::uno; @@ -303,6 +306,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 61b9370f8e26..789f6000a82b 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) { |