vcl/jsdialog/jsdialogbuilder.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dfe13982fb675bfad4564138fc39a2ed82d381d0
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Jun 11 10:29:54 2021 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Jun 11 10:30:07 2021 +0200
jsdialog: sidebar: fix closing
revert change done by mistake in:
64bd4dd2f80b247cb5df3f3e6c54bf2d47bc41a7
Change-Id: I740d5970c713053c7f8a4c880776a1056d132e12
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 6657e830e3e6..79df2662cb04 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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
