From 16ab6e5b162641e5dc0ba6c0664aa8de50bf8e53 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Thu, 25 Jun 2020 12:48:51 +0200 Subject: notebookbar: remember LOKWindowId in interim builders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case of notebookbar we need to remember the same id in every builder for each view to be able to use interim widgets. Then widgets are added to the same map as main notebookbar widgets. SfxViewShell is used as a common id as it is easily accessible. Change-Id: I4fbf2da320396efc80b08bcee9e341c165b1a290 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97199 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97834 Tested-by: Jenkins --- vcl/inc/salinst.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/inc/salinst.hxx') diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 36c51d990d5c..e82f5b55a393 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -165,7 +165,7 @@ public: virtual OpenGLContext* CreateOpenGLContext() = 0; virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile); - virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile); + virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile, sal_uInt64 nLOKWindowId = 0); virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage); virtual weld::Window* GetFrameWeld(const css::uno::Reference& rWindow); -- cgit