diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-09-21 21:32:11 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-21 21:33:59 +0100 |
| commit | ff300e59e74ee88aa6a4981b57a51af416c9e991 (patch) | |
| tree | fd927304bd49c3bea36f63d1da892628c5ba3c60 /sfx2 | |
| parent | 6ba1a664a94cfbfbc7c280b15cee35122710ff86 (diff) | |
fdo#49819 - allow slightly inconsistent docx files to be repaired
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index cf8d0c264f51..9e7407a7ea65 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/FilterOptionsRequest.hpp> #include <com/sun/star/document/XInteractionFilterOptions.hpp> +#include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionAskLater.hpp> #include <com/sun/star/task/FutureDocumentVersionProductUpdateRequest.hpp> @@ -2219,7 +2220,12 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) } return xLoader->filter( aArgs ); - }catch(...) + } + catch (const packages::zip::ZipIOException&) + { + SetError( ERRCODE_IO_BROKENPACKAGE, "Badness in the underlying package format." ); + } + catch(...) {} } |