summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-11 21:43:02 +0100
committerAndras Timar <andras.timar@collabora.com>2015-10-17 23:23:20 +0200
commit8eb290ddedd7f494d45b6b56800c207c320619eb (patch)
tree2bbb1757b647e6879e519cb38e15e800305f48ff /filter
parenta221f339ab586486f4f498f789f9ff877bb276e6 (diff)
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@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit d8fbdc178148d8239be3b7bf3ad2b3a789320bb1)
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/typedetection.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0a457e265bdc..4d166161f6d5 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" .-)