[Libreoffice-commits] core.git: sc/source sw/source

Caolán McNamara caolanm at redhat.com
Tue Sep 26 09:46:13 UTC 2017


 sc/source/filter/xml/xmlimprt.cxx |    2 ++
 sw/source/filter/xml/xmlimp.cxx   |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 99ca3a3c7214ed5d3861c0ad1f644a514857766d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 26 10:21:59 2017 +0100

    close sc and sw docshells too
    
    Change-Id: I2cf06762d50736debd63f385dcae3022412ac0c0

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index a88c94fe73b9..4fe0c8e4a145 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2097,6 +2097,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODS(SvStream &rStream)
     bool ret = xFilter->filter(aArgs);
     xDocSh->SetLoading(SfxLoadedFlags::ALL);
 
+    xDocSh->DoClose();
+
     return ret;
 }
 
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index c82a9303b3e3..6e1d0e70e1f6 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1592,6 +1592,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream)
     bool ret = xFilter->filter(aArgs);
     xDocSh->SetLoading(SfxLoadedFlags::ALL);
 
+    xDocSh->DoClose();
+
     return ret;
 }
 


More information about the Libreoffice-commits mailing list