offapi/com/sun/star/packages/zip/ZipFileAccess.idl | 8 +++++++- package/source/zippackage/zipfileaccess.cxx | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 5ae6803a21f5e2b6e107ee405e9b3346105c6467 Author: Noel Grandin <[email protected]> Date: Wed Jun 12 09:31:50 2013 +0200 Fix exception specification for ZipFileAccess::createWithURL Broken during my conversion to new-style UNO in commit 28e3aff576f06b0b02c7232da5d723e865b3c7ed. Also revert mmeeks workaround in commit c0b78901dba033ed112a023a787575ae54ef877d. (cherry picked from commit 4cfc5c0ba38366c24f729390d0f10ec52e1ec78c) Conflicts: vcl/source/gdi/impimagetree.cxx Change-Id: I1f711bbe19556f1bde7699295ca4f56cff54ddb9 diff --git a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl index b376f97..3f1e32e 100644 --- a/offapi/com/sun/star/packages/zip/ZipFileAccess.idl +++ b/offapi/com/sun/star/packages/zip/ZipFileAccess.idl @@ -20,6 +20,8 @@ #define __com_sun_star_packages_zip_ZipFileAccess_idl__ #include <com/sun/star/packages/zip/XZipFileAccess2.idl> +#include <com/sun/star/packages/zip/ZipException.idl> +#include <com/sun/star/ucb/ContentCreationException.idl> #include <com/sun/star/ucb/InteractiveIOException.idl> @@ -31,7 +33,11 @@ module com { module sun { module star { module packages { module zip { */ service ZipFileAccess : XZipFileAccess2 { - createWithURL([in] string URL) raises ( com::sun::star::io::IOException, com::sun::star::ucb::InteractiveIOException ); + createWithURL([in] string URL) + raises ( com::sun::star::io::IOException, + com::sun::star::ucb::ContentCreationException, + com::sun::star::ucb::InteractiveIOException, + com::sun::star::packages::zip::ZipException ); }; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 4365482..5f30ee9 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -172,7 +172,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu throw lang::DisposedException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); if ( m_pZipFile ) - throw uno::Exception(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // initialization is allowed only one time + throw uno::RuntimeException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // initialization is allowed only one time if ( !aArguments.getLength() ) throw lang::IllegalArgumentException(OSL_LOG_PREFIX, uno::Reference< uno::XInterface >(), 1 ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
