summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-27 13:44:55 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-10-27 14:34:22 +0000
commit1d200aa17096aceca5fe7d3d1d8e4b939e5cb3fd (patch)
tree828ef7e4545e9b76e9711f928d414d6f533bc6a9
parent0095bccdf5e31de6ec6d1a3d83cc31efc8c1daae (diff)
coverity#706590 Uncaught exception
Change-Id: I2005b792c74ad5a5f58c831dcc7caa5134280890
-rw-r--r--offapi/com/sun/star/packages/zip/XZipFileAccess.idl1
-rw-r--r--package/inc/zipfileaccess.hxx2
-rw-r--r--package/source/zippackage/zipfileaccess.cxx2
3 files changed, 3 insertions, 2 deletions
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index 58e7842a43b0..af3ac00ee130 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -45,6 +45,7 @@ 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::packages::WrongPasswordException,
::com::sun::star::packages::zip::ZipException );
};
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 6d3b2d9a45c2..33d3f3346fca 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -82,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, css::packages::zip::ZipException, 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::WrongPasswordException, 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 0efa97d6ea29..ccd07465e8e3 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, packages::zip::ZipException,
+ io::IOException, packages::WrongPasswordException, packages::zip::ZipException,
uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );