diff options
| -rw-r--r-- | offapi/com/sun/star/packages/zip/XZipFileAccess.idl | 6 | ||||
| -rw-r--r-- | package/inc/zipfileaccess.hxx | 3 | ||||
| -rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl index 24cc3132d114..58e7842a43b0 100644 --- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl +++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl @@ -23,8 +23,7 @@ #include <com/sun/star/io/XInputStream.idl> #include <com/sun/star/io/IOException.idl> #include <com/sun/star/uno/XInterface.idl> - - +#include <com/sun/star/packages/zip/ZipException.idl> module com { module sun { module star { module packages { module zip { @@ -45,7 +44,8 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface */ ::com::sun::star::io::XInputStream getStreamByPattern( [in] string aPattern ) raises( ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, + ::com::sun::star::packages::zip::ZipException ); }; diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index af3258e88839..6d3b2d9a45c2 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -21,6 +21,7 @@ #define INCLUDED_PACKAGE_INC_ZIPFILEACCESS_HXX #include <com/sun/star/packages/zip/XZipFileAccess2.hpp> +#include <com/sun/star/packages/zip/ZipException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -81,7 +82,7 @@ public: virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XZipFileAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getStreamByPattern( const OUString& aPattern ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, css::packages::zip::ZipException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index c070d83d22b6..0efa97d6ea29 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -358,7 +358,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements() // XZipFileAccess uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString ) throw ( container::NoSuchElementException, - io::IOException, + io::IOException, packages::zip::ZipException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); |