diff options
Diffstat (limited to 'include/unotools')
-rw-r--r-- | include/unotools/ZipPackageHelper.hxx | 6 | ||||
-rw-r--r-- | include/unotools/accessiblerelationsethelper.hxx | 22 | ||||
-rw-r--r-- | include/unotools/accessiblestatesethelper.hxx | 24 | ||||
-rw-r--r-- | include/unotools/eventcfg.hxx | 14 | ||||
-rw-r--r-- | include/unotools/mediadescriptor.hxx | 4 | ||||
-rw-r--r-- | include/unotools/progresshandlerwrap.hxx | 9 | ||||
-rw-r--r-- | include/unotools/streamhelper.hxx | 16 | ||||
-rw-r--r-- | include/unotools/streamwrap.hxx | 42 |
8 files changed, 58 insertions, 79 deletions
diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx index 5d245bdc38fa..61c77668232f 100644 --- a/include/unotools/ZipPackageHelper.hxx +++ b/include/unotools/ZipPackageHelper.hxx @@ -40,13 +40,11 @@ public: /// @throws css::uno::Exception void addFile( css::uno::Reference< css::uno::XInterface >& xRootFolder, - const OUString& rSourceFile ) - throw( css::uno::Exception, std::exception ); + const OUString& rSourceFile ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > addFolder( css::uno::Reference< css::uno::XInterface >& xRootFolder, - const OUString& rName ) - throw( css::uno::Exception, std::exception ); + const OUString& rName ); void addFolderWithContent( css::uno::Reference< css::uno::XInterface >& xRootFolder, const OUString& rDirURL ); diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 4daa4152da4b..d49e1dbb5ac7 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -62,8 +62,7 @@ public: @return Returns the number of relations or zero if there are none. */ - virtual sal_Int32 SAL_CALL getRelationCount( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRelationCount( ) override; /** Returns the relation of this relation set that is specified by the given index. @@ -79,9 +78,7 @@ public: */ virtual css::accessibility::AccessibleRelation SAL_CALL - getRelation( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getRelation( sal_Int32 nIndex ) override; /** Tests whether the relation set contains a relation matching the specified key. @@ -95,8 +92,7 @@ public: Returns <TRUE/> if there is a (at least one) relation of the given type and <FALSE/> if there is no such relation in the set. */ - virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override; /** Retrieve and return the relation with the given relation type. @@ -110,27 +106,23 @@ public: type INVALID is returned. */ virtual css::accessibility::AccessibleRelation SAL_CALL - getRelationByType( sal_Int16 aRelationType ) - throw (css::uno::RuntimeException, std::exception) override; + getRelationByType( sal_Int16 aRelationType ) override; /// @throws uno::RuntimeException void AddRelation( - const css::accessibility::AccessibleRelation& rRelation) - throw (css::uno::RuntimeException); + const css::accessibility::AccessibleRelation& rRelation); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: /// Mutex guarding this object. diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 34133bebb888..a9cd22b9e282 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -74,8 +74,7 @@ public: Returns <TRUE/> if there is no state in this state set and <FALSE/> if there is at least one state set in it. */ - virtual sal_Bool SAL_CALL isEmpty () - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEmpty () override; /** Checks if the given state is a member of the state set of this object. @@ -88,8 +87,7 @@ public: Returns <TRUE/> if the given state is a member of this object's state set and <FALSE/> otherwise. */ - virtual sal_Bool SAL_CALL contains (sal_Int16 aState) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL contains (sal_Int16 aState) override; /** Checks if all of the given states are in this object's state set. @@ -107,41 +105,35 @@ public: object's state set. */ virtual sal_Bool SAL_CALL containsAll ( - const css::uno::Sequence<sal_Int16>& rStateSet) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<sal_Int16>& rStateSet) override; /** Returns a sequence of all states. */ - virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() override; /** Adds a state to the set. @throws css::uno::RuntimeException */ - void AddState(sal_Int16 aState) - throw (css::uno::RuntimeException); + void AddState(sal_Int16 aState); /** Removes a state from the set if the set contains the state, otherwise nothing is done. @throws css::uno::RuntimeException */ - void RemoveState(sal_Int16 aState) - throw (css::uno::RuntimeException); + void RemoveState(sal_Int16 aState); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; protected: /// Mutex guarding this object. diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index a7fa9fd854cb..4a855994f552 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -70,13 +70,13 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig: virtual ~GlobalEventConfig( ) override; static ::osl::Mutex& GetOwnStaticMutex(); - css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; + void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; + css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + sal_Bool SAL_CALL hasByName( const OUString& aName ) override; + css::uno::Type SAL_CALL getElementType( ) override; + sal_Bool SAL_CALL hasElements( ) override; static OUString GetEventName( GlobalEventId nID ); private: diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 26f68cc6f855..9b0972b79050 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -282,7 +282,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ SAL_DLLPRIVATE bool impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData - ) throw(css::uno::RuntimeException); + ); /** @short tries to open a stream by using the given URL. @@ -308,7 +308,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap SAL_DLLPRIVATE bool impl_openStreamWithURL( const OUString& sURL, bool bLockFile - ) throw(css::uno::RuntimeException); + ); /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 8ed4b7815d1f..35f71eddc71f 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -36,12 +36,9 @@ public: ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > const & xSI ); // XProgressHandler - virtual void SAL_CALL push( const css::uno::Any& Status ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL update( const css::uno::Any& Status ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL pop() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL push( const css::uno::Any& Status ) override; + virtual void SAL_CALL update( const css::uno::Any& Status ) override; + virtual void SAL_CALL pop() override; }; } // namespace utl diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index a98a682f8580..b6b573d1c66a 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -53,15 +53,15 @@ public: ,m_nAvailable(_nAvailable){} // css::io::XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::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; - virtual void SAL_CALL seek( sal_Int64 location ) throw(css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength( ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition( ) override; + virtual sal_Int64 SAL_CALL getLength( ) override; }; } // namespace utl diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index 037aeee7b0f5..b50b92434fd8 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -56,11 +56,11 @@ public: virtual ~OInputStreamWrapper() override; // css::io::XInputStream - virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw(css::io::NotConnectedException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) override; + virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::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; protected: /// throws a NotConnectedException if the object is not connected anymore @@ -86,9 +86,9 @@ public: OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false); // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 _nLocation ) override; + virtual sal_Int64 SAL_CALL getPosition( ) override; + virtual sal_Int64 SAL_CALL getLength( ) override; }; //= OOutputStreamWrapper @@ -102,9 +102,9 @@ protected: virtual ~OOutputStreamWrapper() override; // css::io::XOutputStream - virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; /// throws an exception according to the error flag of m_pSvStream void checkError() const; @@ -131,14 +131,14 @@ private: virtual ~OSeekableOutputStreamWrapper() override; // disambiguate XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) override; virtual void SAL_CALL acquire( ) throw () override; virtual void SAL_CALL release( ) throw () override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 _nLocation ) override; + virtual sal_Int64 SAL_CALL getPosition( ) override; + virtual sal_Int64 SAL_CALL getLength( ) override; }; class UNOTOOLS_DLLPUBLIC OStreamWrapper @@ -154,14 +154,14 @@ public: OStreamWrapper(SvStream& _rStream); // css::io::XStream - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override; // css::io::XOutputStream - virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL truncate() throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; + virtual void SAL_CALL truncate() override; }; } |