diff options
Diffstat (limited to 'sd/source/filter/xml/sdxmlwrp.cxx')
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 6c038cb5dac6..8609f758c46a 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -74,6 +74,7 @@ #include <strings.hrc> #include <sfx2/frame.hxx> +#include <tools/diagnose_ex.h> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -227,6 +228,7 @@ ErrCode ReadThroughComponent( } catch (const 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 const *>(&r); @@ -248,7 +250,7 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; - SAL_WARN( "sd.filter", "SAX parse exception caught while importing:" << r); + SAL_WARN( "sd.filter", "SAX parse exception caught while importing: " << exceptionToString(ex)); OUString sErr( OUString::number( r.LineNumber )); sErr += ","; @@ -271,6 +273,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; @@ -278,22 +281,25 @@ ErrCode ReadThroughComponent( if( bEncrypted ) return ERRCODE_SFX_WRONGPASSWORD; - SAL_WARN( "sd.filter", "SAX exception caught while importing:" << r); + SAL_WARN( "sd.filter", "SAX exception caught while importing: " << exceptionToString(ex)); return SD_XML_READERROR; } - catch (const packages::zip::ZipIOException& r) + catch (const packages::zip::ZipIOException&) { - SAL_WARN( "sd.filter", "Zip exception caught while importing:" << r); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sd.filter", "Zip exception caught while importing: " << exceptionToString(ex)); return ERRCODE_IO_BROKENPACKAGE; } - catch (const io::IOException& r) + catch (const io::IOException&) { - SAL_WARN( "sd.filter", "IO exception caught while importing:" << r); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sd.filter", "IO exception caught while importing: " << exceptionToString(ex)); return SD_XML_READERROR; } - catch (const uno::Exception& r) + catch (const uno::Exception&) { - SAL_WARN( "sd.filter", "uno exception caught while importing:" << r); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sd.filter", "uno exception caught while importing: " << exceptionToString(ex)); return SD_XML_READERROR; } @@ -716,7 +722,8 @@ bool SdXMLFilter::Import( ErrCode& nError ) } catch (const Exception&) { - SAL_WARN( "sd.filter","sd::SdXMLFilter::Import(), exception during clearing of unused named items"); + css::uno::Any ex( cppu::getCaughtException() ); + SAL_WARN( "sd.filter","sd::SdXMLFilter::Import(), exception during clearing of unused named items " << exceptionToString(ex)); } } |