diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-23 12:49:17 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-03 12:13:39 +0200 |
| commit | 9eaaf3b7e1d55d064c0518cbbb7bb724e219e10a (patch) | |
| tree | 89f24ef15a4c0cf3e3707b2f305eb01d7454c60e /sfx2/source/notebookbar | |
| parent | 645021ad49628319423ad29d866d7adb3aee9d97 (diff) | |
jsdialog: get widget depending on viewshell
Notebookbar always gets window id 0 what causes
conflict in map and some widgets doesn't work
Change-Id: I15b4e83d385e83bcf898148a871ddf540257cc81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97099
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97816
Tested-by: Jenkins
Diffstat (limited to 'sfx2/source/notebookbar')
| -rw-r--r-- | sfx2/source/notebookbar/SfxNotebookBar.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index ad8d22dc9f77..ab2bc145f7de 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -388,10 +388,12 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow, bool hasWeldedWrapper = m_pNotebookBarWeldedWrapper.find(pViewShell) != m_pNotebookBarWeldedWrapper.end(); if ((!hasWeldedWrapper || bReloadNotebookbar) && pNotebookBar->IsWelded()) { + sal_uInt64 nWindowId = reinterpret_cast<sal_uInt64>(pViewShell); m_pNotebookBarWeldedWrapper.emplace(std::make_pair(pViewShell, new WeldedTabbedNotebookbar(pNotebookBar->GetMainContainer(), pNotebookBar->GetUIFilePath(), - xFrame))); + xFrame, + nWindowId))); pNotebookBar->SetDisposeCallback(LINK(nullptr, SfxNotebookBar, VclDisposeHdl), pViewShell); } |