diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-25 12:48:51 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-03 14:49:46 +0200 |
| commit | 16ab6e5b162641e5dc0ba6c0664aa8de50bf8e53 (patch) | |
| tree | 3f6fd411a17ef6e064074271425f8779d95b5a3f /include | |
| parent | 126c5e57d732359788010d6a364a5011d2e4a8c8 (diff) | |
notebookbar: remember LOKWindowId in interim builders
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97834
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/InterimItemWindow.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 3ba842a3eca1..2ff2dd6d2303 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -24,7 +24,8 @@ public: virtual void GetFocus() override; protected: - InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID); + InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, + sal_uInt64 nLOKWindowId = 0); // pass keystrokes from our child window through this to handle focus changes correctly // returns true if keystroke is consumed diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 4cf23a71d64a..2532504b8c16 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1329,7 +1329,7 @@ public: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString &rUIFile, bool bMobile = false); - static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of vcl parent windows + static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile, sal_uInt64 nLOKWindowId = 0); //for the duration of vcl parent windows static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage, |