summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-31 17:14:18 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-09-05 17:14:26 +0200
commit74d1296ff968f3571080120297764dac554f4b23 (patch)
tree76c64675deb8ee57c738b22f5296d1159a57571f
parentadce43a12a9e9b3834e188ea0deb4af8d28a2d06 (diff)
Resolves: tdf#112063 ensure closing dialog is not parent for file dialog
Change-Id: Iea2ecaf1669cf7af00f00b1f0b32e24d34ec3757 Reviewed-on: https://gerrit.libreoffice.org/41781 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--basctl/source/basicide/moduldl2.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 897771d895ea..c3e0bce281f9 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 );