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

[Caolán McNamara]

 sd/source/filter/ppt/pptin.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit be630d7bd9298c1447983af99959aa7de2d6e2a1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 22 17:23:14 2017 +0000

    catch structured storage exceptions during testing
    
    Change-Id: Ibce297f85ebcf5ebde1a9e81afef9b0c41ebeb1a

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4e3ca127c265..3b2589384909 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2759,9 +2759,17 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT(
 
 extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(SvStream &rStream)
 {
-    tools::SvRef<SotStorage> xStorage(new SotStorage(rStream));
-    if (xStorage->GetError())
+    tools::SvRef<SotStorage> xStorage;
+    try
+    {
+        xStorage = tools::SvRef<SotStorage>(new SotStorage(rStream));
+        if (xStorage->GetError())
+            return false;
+    }
+    catch (...)
+    {
         return false;
+    }
 
     tools::SvRef<SotStorageStream> xDocStream(xStorage->OpenSotStream( "PowerPoint Document", StreamMode::STD_READ));
     if ( !xDocStream.is() )