ofz#2289 catch bad storage exception

Change-Id: I51b44a49eb05da0bf89ae2db7b5f2d4647c3ee87

ofz#2289 catch bad storage exception
Change-Id: I51b44a49eb05da0bf89ae2db7b5f2d4647c3ee87
9c56cbf6 · Caolán McNamara · 4c1d68ca · 9c56cbf6
Kaydet (Commit) 9c56cbf6 authored Haz 17, 2017 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

ww8par.cxx sw/source/filter/ww8/ww8par.cxx +10 -1

No files found.
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6178,7 +6178,16 @@ bool SAL_CALL TestImportDOC(SvStream &rStream, const OUString &rFltName)
    pReader->pStrm = &rStream;
    if (rFltName != "WW6")
    {
-        xStorage = tools::SvRef<SotStorage>(new SotStorage(rStream));
+        try
+        {
+            xStorage = tools::SvRef<SotStorage>(new SotStorage(rStream));
+            if (xStorage->GetError())
+                return false;
+        }
+        catch (...)
+        {
+            return false;
+        }
        pReader->pStg = xStorage.get();
    }
    pReader->SetFltName(rFltName);