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

Caolán McNamara caolanm at redhat.com
Sat Nov 4 09:47:13 UTC 2017


 sc/source/filter/excel/excel.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit eb6ec4b606e213201e790f49253a5355a2d35eb9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 3 14:27:19 2017 +0000

    ofz#4041 Abrt
    
    Change-Id: I8d9466bd4594dec819704141b03c280f52d824ef
    Reviewed-on: https://gerrit.libreoffice.org/44267
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 5f9addb25489..ca4262d8cbaa 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -255,7 +255,15 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(SvStream& rStream)
     aDocOpt.SetLookUpColRowNames(false);
     aDocument.SetDocOptions(aDocOpt);
     aDocument.MakeTable(0);
-    return ScFormatFilter::Get().ScImportExcel(aMedium, &aDocument, EIF_AUTO) == ERRCODE_NONE;
+    bool bRet(false);
+    try
+    {
+        bRet = ScFormatFilter::Get().ScImportExcel(aMedium, &aDocument, EIF_AUTO) == ERRCODE_NONE;
+    }
+    catch (const css::ucb::ContentCreationException &)
+    {
+    }
+    return bRet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list