basctl/source/basicide/moduldl2.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 69c1e6c5489a4709ae4a1db43673e879eb31919c
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Aug 31 17:14:18 2017 +0100
Resolves: tdf#112063 ensure closing dialog is not parent for file dialog
Change-Id: Iea2ecaf1669cf7af00f00b1f0b32e24d34ec3757
Reviewed-on: https://gerrit.libreoffice.org/41764
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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<ExportDialog> 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
