mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#112063 ensure closing dialog is not parent for file dialog

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2017-08-31 17:14:18 +01:00
parent fa7e150241
commit 69c1e6c548
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
basctl/source/basicide/moduldl2.cxx
View File

@@ -1104,12 +1104,16 @@ void LibPage::Export()
return; return;
} }
ScopedVclPtrInstance< ExportDialog > aNewDlg(this); ScopedVclPtrInstance<ExportDialog> aNewDlg(this);
if (aNewDlg->Execute() == RET_OK) if (aNewDlg->Execute() == RET_OK)
{ {
try 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 ); ExportAsPackage( aLibName );
else else
ExportAsBasic( aLibName ); ExportAsBasic( aLibName );