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 629eae76961a8b455d0b966db5f3888c30d0280e Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Nov 24 18:35:12 2012 +0100 this method actually can throw, related fdo#57451 Change-Id: I26b79829029e127eb8b9ab4fbea3e0f02035ee41 Signed-off-by: Michael Meeks <michael.me...@suse.com> diff --git a/oox/inc/oox/core/xmlfilterbase.hxx b/oox/inc/oox/core/xmlfilterbase.hxx index 0e015da..e001df0 100644 --- a/oox/inc/oox/core/xmlfilterbase.hxx +++ b/oox/inc/oox/core/xmlfilterbase.hxx @@ -235,7 +235,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 583170b..e7db943 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -236,7 +236,7 @@ XmlFilterBase::~XmlFilterBase() // ---------------------------------------------------------------------------- -void XmlFilterBase::importDocumentProperties() throw() +void XmlFilterBase::importDocumentProperties() { Reference< XMultiServiceFactory > xFactory( getServiceFactory(), UNO_QUERY ); MediaDescriptor aMediaDesc( getMediaDescriptor() ); commit 4ce8d87c349ad821dec2edb8e4eca5b268b762a9 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Nov 24 18:56:18 2012 +0100 we need to catch the exception here, fdo#57451 Change-Id: I203aa640e7d4373f3a090a4988c28c6059b93064 Signed-off-by: Michael Meeks <michael.me...@suse.com> diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 84f9331..51f764e 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; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits