diff options
Diffstat (limited to 'svx/source/xml/xmlgrhlp.cxx')
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 63 |
1 files changed, 18 insertions, 45 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 4ef3bfe43dff..bb922a2b2cbd 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -75,11 +75,11 @@ class SvXMLGraphicInputStream: { private: - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw(NotConnectedException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw(NotConnectedException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override; + virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) override; + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; private: @@ -151,7 +151,6 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) } sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException(); @@ -160,7 +159,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rDa } sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -169,7 +167,6 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& } void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -177,7 +174,7 @@ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) mxStmWrapper->skipBytes( nBytesToSkip ); } -sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -185,7 +182,7 @@ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedExcep return mxStmWrapper->available(); } -void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException, std::exception ) +void SAL_CALL SvXMLGraphicInputStream::closeInput() { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -199,9 +196,9 @@ class SvXMLGraphicOutputStream: private: // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override; + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; private: @@ -242,7 +239,6 @@ SvXMLGraphicOutputStream::~SvXMLGraphicOutputStream() } void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -251,7 +247,6 @@ void SAL_CALL SvXMLGraphicOutputStream::writeBytes( const Sequence< sal_Int8 >& } void SAL_CALL SvXMLGraphicOutputStream::flush() - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -260,7 +255,6 @@ void SAL_CALL SvXMLGraphicOutputStream::flush() } void SAL_CALL SvXMLGraphicOutputStream::closeOutput() - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { if( !mxStmWrapper.is() ) throw NotConnectedException() ; @@ -799,7 +793,6 @@ void SvXMLGraphicHelper::Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ) // XGraphicObjectResolver OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& rURL ) - throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); const sal_Int32 nIndex = maGrfURLs.size(); @@ -843,7 +836,6 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveGraphicObjectURL( const OUString& r // XBinaryStreamResolver Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUString& rURL ) - throw( RuntimeException, std::exception ) { Reference< XInputStream > xRet; OUString aPictureStorageName, aGraphicId; @@ -864,7 +856,6 @@ Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUS } Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() - throw( RuntimeException, std::exception ) { Reference< XOutputStream > xRet; @@ -882,7 +873,6 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream() } OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOutputStream >& rxBinaryStream ) - throw( RuntimeException, std::exception ) { OUString aRet; @@ -947,29 +937,20 @@ protected: // ____ XInitialization ____ // one argument is allowed, which is the XStorage - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw (Exception, - RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // ____ XGraphicObjectResolver ____ - virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) override; // ____ XBinaryStreamResolver ____ - virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) - throw (RuntimeException, std::exception) override; - virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() - throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) - throw (RuntimeException, std::exception) override; + virtual Reference< io::XInputStream > SAL_CALL getInputStream( const OUString& aURL ) override; + virtual Reference< io::XOutputStream > SAL_CALL createOutputStream() override; + virtual OUString SAL_CALL resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: SvXMLGraphicHelperMode m_eGraphicHelperMode; @@ -995,7 +976,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::disposing() // ____ XInitialization ____ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; if( aArguments.getLength() > 0 ) @@ -1011,7 +991,6 @@ void SAL_CALL SvXMLGraphicImportExportHelper::initialize( // ____ XGraphicObjectResolver ____ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const OUString& aURL ) - throw (uno::RuntimeException, std::exception) { return m_xGraphicObjectResolver->resolveGraphicObjectURL( aURL ); } @@ -1019,24 +998,20 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveGraphicObjectURL( const // ____ XBinaryStreamResolver ____ Reference< io::XInputStream > SAL_CALL SvXMLGraphicImportExportHelper::getInputStream( const OUString& aURL ) - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->getInputStream( aURL ); } Reference< io::XOutputStream > SAL_CALL SvXMLGraphicImportExportHelper::createOutputStream() - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->createOutputStream(); } OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Reference< io::XOutputStream >& aBinaryStream ) - throw (uno::RuntimeException, std::exception) { return m_xBinaryStreamResolver->resolveOutputStream( aBinaryStream ); } // ____ XServiceInfo ____ OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() - throw (uno::RuntimeException, std::exception) { if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read ) return OUString("com.sun.star.comp.Svx.GraphicImportHelper"); @@ -1044,13 +1019,11 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName() } sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { // XGraphicObjectResolver and XBinaryStreamResolver are not part of any service Sequence< OUString > aSupportedServiceNames( 2 ); |