[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source

[Caolán McNamara]

 filter/source/config/cache/typedetection.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d8fbdc178148d8239be3b7bf3ad2b3a789320bb1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Oct 11 21:43:02 2015 +0100

    ignore orcus::sax::malformed_xml_error etc too
    
    e.g. kde323651-1.pptx etc
    
    Change-Id: I59319733902a0c1298094bc1541d763938334ad4
    (cherry picked from commit 70049dbeb286cb0613526e1c3c0318d32a446e58)
    Reviewed-on: https://gerrit.libreoffice.org/19311
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0a457e2..4d16616 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1040,14 +1040,14 @@ OUString TypeDetection::impl_askDetectService(const OUString&               sDet
         sDeepType = xDetector->detect(lDescriptor);
         rDescriptor << lDescriptor;
     }
-    catch(const css::uno::Exception&)
-        {
-            // We should ignore errors here.
-            // Thrown exceptions mostly will end in crash recovery ...
-            // But might be we find another deep detection service which can detect the same
-            // document without a problem .-)
-            sDeepType.clear();
-        }
+    catch (...)
+    {
+        // We should ignore errors here.
+        // Thrown exceptions mostly will end in crash recovery ...
+        // But might be we find another deep detection service which can detect the same
+        // document without a problem .-)
+        sDeepType.clear();
+    }
 
     // seek to 0 is an optional feature to be more robust against
     // "simple implemented detect services" .-)