[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - basctl/source

[Caolán McNamara]

 basctl/source/basicide/moduldl2.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 74d1296ff968f3571080120297764dac554f4b23
Author: Caolán McNamara <caolanm at 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/41781
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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 );