Kaydet (Commit) 79943fac authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#706591 Uncaught exception

Change-Id: I9b705664c3814aea5c433526ad147a8ab11c2d0f
üst 0c0c77af
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
#include <com/sun/star/io/XInputStream.idl> #include <com/sun/star/io/XInputStream.idl>
#include <com/sun/star/io/IOException.idl> #include <com/sun/star/io/IOException.idl>
#include <com/sun/star/uno/XInterface.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 { module com { module sun { module star { module packages { module zip {
...@@ -45,7 +44,8 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface ...@@ -45,7 +44,8 @@ interface XZipFileAccess: ::com::sun::star::uno::XInterface
*/ */
::com::sun::star::io::XInputStream getStreamByPattern( [in] string aPattern ) ::com::sun::star::io::XInputStream getStreamByPattern( [in] string aPattern )
raises( ::com::sun::star::container::NoSuchElementException, raises( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::io::IOException ); ::com::sun::star::io::IOException,
::com::sun::star::packages::zip::ZipException );
}; };
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_PACKAGE_INC_ZIPFILEACCESS_HXX #define INCLUDED_PACKAGE_INC_ZIPFILEACCESS_HXX
#include <com/sun/star/packages/zip/XZipFileAccess2.hpp> #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/XInitialization.hpp>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
...@@ -81,7 +82,7 @@ public: ...@@ -81,7 +82,7 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XZipFileAccess // 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 // XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
...@@ -358,7 +358,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements() ...@@ -358,7 +358,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements()
// XZipFileAccess // XZipFileAccess
uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString ) uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString )
throw ( container::NoSuchElementException, throw ( container::NoSuchElementException,
io::IOException, io::IOException, packages::zip::ZipException,
uno::RuntimeException, std::exception ) uno::RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment