From 69c1e6c5489a4709ae4a1db43673e879eb31919c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 31 Aug 2017 17:14:18 +0100 Subject: Resolves: tdf#112063 ensure closing dialog is not parent for file dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iea2ecaf1669cf7af00f00b1f0b32e24d34ec3757 Reviewed-on: https://gerrit.libreoffice.org/41764 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/basicide/moduldl2.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index fd78b185e7eb..55391863174d 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1104,12 +1104,16 @@ void LibPage::Export() return; } - ScopedVclPtrInstance< ExportDialog > aNewDlg(this); + ScopedVclPtrInstance aNewDlg(this); if (aNewDlg->Execute() == RET_OK) { try { - if (aNewDlg->isExportAsPackage()) + bool bExportAsPackage = aNewDlg->isExportAsPackage(); + //tdf#112063 ensure closing aNewDlg is not selected as + //parent of file dialog from ExportAs... + aNewDlg.disposeAndClear(); + if (bExportAsPackage) ExportAsPackage( aLibName ); else ExportAsBasic( aLibName ); -- cgit v1.2.3