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 /svx/source | |
| 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 'svx/source')
| -rw-r--r-- | svx/source/tbxctrls/StylesPreviewWindow.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index 43d3b140cb35..09e8a849fb68 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -26,6 +26,7 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/tplpitem.hxx> +#include <sfx2/viewsh.hxx> #include <editeng/editids.hrc> #include <editeng/fontitem.hxx> @@ -483,7 +484,8 @@ IMPL_LINK(StylesPreviewWindow_Base, GoDown, const OString&, /*rItem*/, void) StylesPreviewWindow_Impl::StylesPreviewWindow_Impl( vcl::Window* pParent, std::vector<OUString>& aDefaultStyles, css::uno::Reference<css::frame::XDispatchProvider>& xDispatchProvider) - : InterimItemWindow(pParent, "svx/ui/stylespreview.ui", "ApplyStyleBox") + : InterimItemWindow(pParent, "svx/ui/stylespreview.ui", "ApplyStyleBox", + reinterpret_cast<sal_uInt64>(SfxViewShell::Current())) , StylesPreviewWindow_Base(*m_xBuilder, aDefaultStyles, xDispatchProvider) { SetOptimalSize(); |