diff options
Diffstat (limited to 'oox/source/ole')
| -rw-r--r-- | oox/source/ole/olestorage.cxx | 24 | ||||
| -rw-r--r-- | oox/source/ole/vbamodule.cxx | 14 |
2 files changed, 19 insertions, 19 deletions
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index b0be04d781fa..4b8d3886e266 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -65,13 +65,13 @@ public: const OUString& rElementName ); virtual ~OleOutputStream(); - virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException ); - virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException ); - virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException ); + virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ); - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); private: void ensureSeekable() const throw( IOException ); @@ -107,37 +107,37 @@ OleOutputStream::~OleOutputStream() { } -void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) { ensureSeekable(); mxSeekable->seek( nPos ); } -sal_Int64 SAL_CALL OleOutputStream::getPosition() throw( IOException, RuntimeException ) +sal_Int64 SAL_CALL OleOutputStream::getPosition() throw( IOException, RuntimeException, std::exception ) { ensureSeekable(); return mxSeekable->getPosition(); } -sal_Int64 SAL_CALL OleOutputStream::getLength() throw( IOException, RuntimeException ) +sal_Int64 SAL_CALL OleOutputStream::getLength() throw( IOException, RuntimeException, std::exception ) { ensureSeekable(); return mxSeekable->getLength(); } -void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); mxOutStrm->writeBytes( rData ); } -void SAL_CALL OleOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); mxOutStrm->flush(); } -void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); ensureSeekable(); diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 64eb7237f68d..dc1c9adc199f 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -60,7 +60,7 @@ class OleIdToNameContainer : public OleIdToNameContainer_BASE public: OleIdToNameContainer() {} // XIndexContainer Methods - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); OUString sOleName; @@ -68,7 +68,7 @@ public: throw IllegalArgumentException(); ObjIdToNameHash[ Index ] = sOleName; } - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -76,7 +76,7 @@ public: ObjIdToNameHash.erase( ObjIdToNameHash.find( Index ) ); } // XIndexReplace Methods - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -87,12 +87,12 @@ public: ObjIdToNameHash[ Index ] = sOleName; } // XIndexAccess Methods - virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return ObjIdToNameHash.size(); } - virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -100,11 +100,11 @@ public: return makeAny( ObjIdToNameHash[ Index ] ); } // XElementAccess Methods - virtual Type SAL_CALL getElementType( ) throw (RuntimeException) + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) { return ::getCppuType( static_cast< const OUString* >( 0 ) ); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return ( getCount() > 0 ); |