diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-11 10:29:54 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-28 09:15:11 +0200 |
| commit | 2cb0ebaff2896feafc1f574ca8fb1f13a11f5401 (patch) | |
| tree | 40e5e5646b2385ecd7dd4cb63707a22f495fa0e6 /vcl | |
| parent | a72b7e2f38cc8c7372f24365a8458528205b09e4 (diff) | |
jsdialog: sidebar: fix closing
revert change done by mistake in:
64bd4dd2f80b247cb5df3f3e6c54bf2d47bc41a7
Change-Id: I740d5970c713053c7f8a4c880776a1056d132e12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119553
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index 954eca380bce..335b9cfc23d7 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -419,6 +419,8 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIR { vcl::Window* pRoot = m_xBuilder->get_widget_root(); + m_aParentDialog = pRoot->GetParentWithLOKNotifier(); + if (rUIFile == "sfx/ui/panel.ui") { // builder for Panel, get SidebarDockingWindow as m_aContentWindow @@ -434,8 +436,6 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIR m_aContentWindow = m_aContentWindow->GetParent(); } - m_aParentDialog = m_aContentWindow; - InsertWindowToMap(m_nWindowId); initializeSender(GetNotifierWindow(), GetContentWindow(), GetTypeOfJSON()); |