summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-31 17:14:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-09-01 11:49:45 +0200
commit69c1e6c5489a4709ae4a1db43673e879eb31919c (patch)
tree37035b6bd7ac6f9346e0608dcaaefa6975d4d29c
parentfa7e15024163c0848b8c3506bcbe40f031bff14b (diff)
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 <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 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 );