writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 3 ++- writerperfect/source/writer/MSWorksImportFilter.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 0a5f8dcdf2f1dcaf3e0ef1b626906f6496de6b23 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue May 19 10:28:49 2015 +0200 ...assuming these want to actually catch css::uno::Exceptions (which ones? or is this just needless cargo cult anyway?) Change-Id: If1450d4f34acd1475eb71c49e0eaf99c40833a8e diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index f68b4a0..8d7dc75 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -68,8 +68,9 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp else if (pDlg->hasUserCalledCancel()) return false; } - catch (...) + catch (css::uno::Exception & e) { + SAL_WARN("writerperfect", "ignoring Exception " << e.Message); } } return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str()); diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index f06a21a..d5e0947 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -58,8 +58,9 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, return false; } } - catch (...) + catch (css::uno::Exception & e) { + SAL_WARN("writerperfect", "ignoring Exception " << e.Message); } return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str()); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits