diff options
Diffstat (limited to 'sw/source/filter/xml/swxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 0aec06ae11d0..c125e92dc056 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -85,6 +85,7 @@ #include <istyleaccess.hxx> #include <sfx2/DocumentMetadataAccess.hxx> +#include <tools/diagnose_ex.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -185,8 +186,9 @@ ErrCode ReadThroughComponent( else xParser->parseStream( aParserInput ); } - catch( xml::sax::SAXParseException& r ) + catch( xml::sax::SAXParseException& r) { + css::uno::Any ex( cppu::getCaughtException() ); // sax parser sends wrapped exceptions, // try to find the original one xml::sax::SAXException aSaxEx = *static_cast<xml::sax::SAXException*>(&r); @@ -208,7 +210,7 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; - SAL_WARN( "sw", "SAX parse exception caught while importing: " << r ); + SAL_WARN( "sw", "SAX parse exception caught while importing: " << exceptionToString(ex) ); const OUString sErr( OUString::number( r.LineNumber ) + "," @@ -231,6 +233,7 @@ ErrCode ReadThroughComponent( } catch(const xml::sax::SAXException& r) { + css::uno::Any ex( cppu::getCaughtException() ); packages::zip::ZipIOException aBrokenPackage; if ( r.WrappedException >>= aBrokenPackage ) return ERRCODE_IO_BROKENPACKAGE; @@ -238,22 +241,25 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; - SAL_WARN( "sw", "SAX exception caught while importing: " << r); + SAL_WARN( "sw", "uno exception caught while importing: " << exceptionToString(ex) ); return ERR_SWG_READ_ERROR; } - catch(const packages::zip::ZipIOException& r) + catch(const packages::zip::ZipIOException&) { - SAL_WARN( "sw", "Zip exception caught while importing: " << r); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sw", "uno exception caught while importing: " << exceptionToString(ex) ); return ERRCODE_IO_BROKENPACKAGE; } - catch(const io::IOException& r) + catch(const io::IOException&) { - SAL_WARN( "sw", "IO exception caught while importing: " << r); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sw", "uno exception caught while importing: " << exceptionToString(ex) ); return ERR_SWG_READ_ERROR; } - catch(const uno::Exception& r) + catch(const uno::Exception&) { - SAL_WARN( "sw", "uno exception caught while importing: " << r ); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sw", "uno exception caught while importing: " << exceptionToString(ex) ); return ERR_SWG_READ_ERROR; } |