oox/inc/oox/core/xmlfilterbase.hxx | 2 +- oox/source/core/xmlfilterbase.cxx | 2 +- sc/source/filter/oox/excelfilter.cxx | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit c54534415dd71afffaff929617a4ddfcd599b152 Author: Markus Mohrhard <[email protected]> Date: Sat Nov 24 18:56:18 2012 +0100 we need to catch the exception here, fdo#57451 Change-Id: I203aa640e7d4373f3a090a4988c28c6059b93064 diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 8320780..fc9d3b5 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -129,7 +129,14 @@ bool ExcelFilter::importDocument() throw() WorkbookGlobalsRef xBookGlob = WorkbookHelper::constructGlobals( *this ); if ( xBookGlob.get() && importFragment( new WorkbookFragment( *xBookGlob, aWorkbookPath ) ) ) { - importDocumentProperties(); + try + { + importDocumentProperties(); + } + catch( const Exception& e ) + { + SAL_WARN("sc", "exception when importing document properties " << e.Message); + } return true; } return false; commit 144a8586b8a3cc16a00807f5968886e73c44c0d9 Author: Markus Mohrhard <[email protected]> Date: Sat Nov 24 18:35:12 2012 +0100 this method actually can throw, related fdo#57451 Change-Id: I26b79829029e127eb8b9ab4fbea3e0f02035ee41 diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx index dad67e3..bf066fd 100644 --- a/oox/inc/oox/core/xmlfilterbase.hxx +++ b/oox/inc/oox/core/xmlfilterbase.hxx @@ -226,7 +226,7 @@ public: sal_Int32 getNamespaceId( const ::rtl::OUString& rUrl ); - void importDocumentProperties() throw(); + void importDocumentProperties(); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 70b3936..64aec26 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -206,7 +206,7 @@ XmlFilterBase::~XmlFilterBase() // ---------------------------------------------------------------------------- -void XmlFilterBase::importDocumentProperties() throw() +void XmlFilterBase::importDocumentProperties() { Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY ); MediaDescriptor aMediaDesc( getMediaDescriptor() ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
