summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-06-18 14:08:48 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-07-03 12:13:25 +0200
commit645021ad49628319423ad29d866d7adb3aee9d97 (patch)
treee7bb54f51c5efd87134af0bb3c6dd7a6532e4f98
parentcef4ed2a79a5c0643afd513bc163fadff047ea82 (diff)
jsdialog: always clean remember widgets
avoid crash when old, freed widged will be used Change-Id: I4f4ec40bc8d1fdda4a141d1167c05d863d516633 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97014 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97814 Tested-by: Jenkins
-rw-r--r--vcl/jsdialog/jsdialogbuilder.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 9f566b7c7434..1932bcbd7d02 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -101,11 +101,7 @@ JSInstanceBuilder::JSInstanceBuilder(vcl::Window* pParent, const OUString& rUIRo
}
}
-JSInstanceBuilder::~JSInstanceBuilder()
-{
- if (m_nWindowId && m_bHasTopLevelDialog)
- GetLOKWeldWidgetsMap().erase(m_nWindowId);
-}
+JSInstanceBuilder::~JSInstanceBuilder() { GetLOKWeldWidgetsMap().erase(m_nWindowId); }
std::map<vcl::LOKWindowId, WidgetMap>& JSInstanceBuilder::GetLOKWeldWidgetsMap()
{