diff options
Diffstat (limited to 'comphelper')
60 files changed, 510 insertions, 828 deletions
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx index 135adfdb9304..5a6cff89583d 100644 --- a/comphelper/qa/container/comphelper_ifcontainer.cxx +++ b/comphelper/qa/container/comphelper_ifcontainer.cxx @@ -47,8 +47,7 @@ public: explicit ContainerListener(ContainerStats *pStats) : m_pStats(pStats) { m_pStats->m_nAlive++; } virtual ~ContainerListener() override { m_pStats->m_nAlive--; } - virtual void SAL_CALL disposing( const EventObject& ) - throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const EventObject& ) override { m_pStats->m_nDisposed++; } diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx index e881f6739db6..b39eef1d5bd4 100644 --- a/comphelper/qa/container/testifcontainer.cxx +++ b/comphelper/qa/container/testifcontainer.cxx @@ -48,13 +48,12 @@ class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener > { public: // Methods - virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException) override + virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) override { } - virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) - throw(css::beans::PropertyVetoException, css::uno::RuntimeException) override + virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) override { } diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 636c30587370..1180805542fa 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -89,29 +89,26 @@ class testCollator : public cppu::WeakImplHelper< i18n::XCollator > public: virtual sal_Int32 SAL_CALL compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException, std::exception) override + const OUString& str2, sal_Int32 off2, sal_Int32 len2) override { return str1.copy(off1, len1).compareTo(str2.copy(off2, len2)); } virtual sal_Int32 SAL_CALL compareString( const OUString& str1, - const OUString& str2) throw(uno::RuntimeException, std::exception) override + const OUString& str2) override { return str1.compareTo(str2); } - virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) - throw(uno::RuntimeException, std::exception) override {return 0;} + virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) override {return 0;} virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&, - const lang::Locale&, sal_Int32) throw(uno::RuntimeException, std::exception) override {return 0;} + const lang::Locale&, sal_Int32) override {return 0;} virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&, - const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException, std::exception) override {} - virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) - throw(uno::RuntimeException, std::exception) override + const lang::Locale&, const uno::Sequence< sal_Int32 >&) override {} + virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) override { return uno::Sequence< OUString >(); } - virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) - throw(uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) override { return uno::Sequence< sal_Int32 >(); } @@ -123,64 +120,59 @@ class testBreakIterator : public cppu::WeakImplHelper< i18n::XBreakIterator > { public: virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) - throw(uno::RuntimeException, std::exception) override {return -1;} + const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;} virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) - throw(uno::RuntimeException, std::exception) override {return -1;} + const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;} virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16) override { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16) override { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Bool ) - throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16, sal_Bool ) override { return i18n::Boundary(); } virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 ) override { return false; } virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32, - const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& , sal_Int16 ) override { return false; } virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return 0; } virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return 0; } virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return rText.getLength(); } virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32, const lang::Locale&, sal_Int32, const i18n::LineBreakHyphenationOptions&, - const i18n::LineBreakUserOptions&) - throw(uno::RuntimeException, std::exception) override + const i18n::LineBreakUserOptions&) override { return i18n::LineBreakResults(); } - virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) - throw(uno::RuntimeException, std::exception) override { return -1; } + virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) override { return -1; } virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + const lang::Locale&, sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 CharType ) override { const sal_Unicode *pStr = rText.getStr()+nStartPos; for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) @@ -194,9 +186,9 @@ public: return -1; } virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + const lang::Locale&, sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 CharType ) override { const sal_Unicode *pStr = rText.getStr()+nStartPos; for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 4a0bbc3eeb72..c3df018c14ee 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -48,7 +48,7 @@ public: 0 ); //??? } - virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) override; }; class AnyCompareFactory : public cppu::WeakImplHelper< XAnyCompareFactory, XInitialization, XServiceInfo > @@ -62,19 +62,18 @@ public: {} // XAnyCompareFactory - virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) override; // XInitialization - 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; // 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; }; -sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) { sal_Int16 aResult = 0; @@ -89,7 +88,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw return aResult; } -Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) +Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) { // for now only OUString properties compare is implemented // so no check for the property name is done @@ -100,7 +99,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con return Reference< XAnyCompare >(); } -void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) +void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) { if( aArguments.getLength() ) { @@ -112,17 +111,17 @@ void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) } } -OUString SAL_CALL AnyCompareFactory::getImplementationName( ) throw( RuntimeException, std::exception ) +OUString SAL_CALL AnyCompareFactory::getImplementationName( ) { return OUString( "AnyCompareFactory" ); } -sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 803b171dbf1e..9bc88a408d43 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -37,35 +37,24 @@ public: IndexedPropertyValuesContainer() throw(); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: IndexedPropertyValues maProperties; @@ -77,8 +66,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw() // XIndexContainer void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nSize >= nIndex) && (nIndex >= 0)) @@ -119,8 +106,6 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c } void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -154,8 +139,6 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) // XIndexReplace void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -171,14 +154,11 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, // XIndexAccess sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) - throw(css::uno::RuntimeException, std::exception) { return maProperties.size(); } css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if (!((nIndex < nSize) && (nIndex >= 0))) @@ -189,29 +169,27 @@ css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIn // XElementAccess css::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) - throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) { return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 4ac5b42fb5f5..7e72ccce808e 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -38,37 +38,25 @@ public: NamedPropertyValuesContainer() throw(); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual 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; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: NamedPropertyValues maProperties; @@ -80,8 +68,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw() // XNameContainer void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( maProperties.find( aName ) != maProperties.end() ) throw container::ElementExistException(); @@ -94,8 +80,6 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, } void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( Name ); if( aIter == maProperties.end() ) @@ -106,8 +90,6 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -122,8 +104,6 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName // XNameAccess css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -137,13 +117,11 @@ css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& } css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) - throw(css::uno::RuntimeException, std::exception) { return comphelper::mapKeysToSequence(maProperties); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); return aIter != maProperties.end(); @@ -151,29 +129,27 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName // XElementAccess css::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) - throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) { return OUString( "NamedPropertyValuesContainer" ); } -sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index e80f550bb02e..ae37e3a311ef 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.cxx @@ -44,25 +44,21 @@ namespace comphelper void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ ) - throw (RuntimeException, std::exception) { } void OContainerListener::_elementRemoved( const ContainerEvent& ) - throw (RuntimeException, std::exception) { } void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ ) - throw (RuntimeException, std::exception) { } void OContainerListener::_disposing(const EventObject& ) - throw (RuntimeException, std::exception) { } @@ -119,7 +115,7 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -135,21 +131,21 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementInserted(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementRemoved(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementReplaced(_rEvent); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 1dc23292d1e7..69e89760e531 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -155,31 +155,31 @@ namespace comphelper virtual ~EnumerableMap() override; // XInitialization - 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; // XEnumerableMap - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) override; // XMap - virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override; - virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; - virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; + virtual Type SAL_CALL getKeyType() override; + virtual Type SAL_CALL getValueType() override; + virtual void SAL_CALL clear( ) override; + virtual sal_Bool SAL_CALL containsKey( const Any& _key ) override; + virtual sal_Bool SAL_CALL containsValue( const Any& _value ) override; + virtual Any SAL_CALL get( const Any& _key ) override; + virtual Any SAL_CALL put( const Any& _key, const Any& _value ) override; + virtual Any SAL_CALL remove( const Any& _key ) override; // XElementAccess (base of XMap) - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() 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; public: // XServiceInfo, static version (used for component registration) @@ -278,8 +278,8 @@ namespace comphelper } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual Any SAL_CALL nextElement( ) override; protected: virtual ~MapEnumeration() override @@ -317,7 +317,7 @@ namespace comphelper } - void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) { ComponentMethodGuard aGuard( *this, ComponentMethodGuard::MethodType::WithoutInit ); if ( impl_isInitialized_nothrow() ) @@ -496,42 +496,42 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, Isolated ); } - Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getKeyType() { ComponentMethodGuard aGuard( *this ); return m_aData.m_aKeyType; } - Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getValueType() { ComponentMethodGuard aGuard( *this ); return m_aData.m_aValueType; } - void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL EnumerableMap::clear( ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -542,7 +542,7 @@ namespace comphelper } - sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -552,7 +552,7 @@ namespace comphelper } - sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) { ComponentMethodGuard aGuard( *this ); impl_checkValue_throw( _value ); @@ -569,7 +569,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::get( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -582,7 +582,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -608,7 +608,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::remove( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -629,31 +629,31 @@ namespace comphelper } - Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getElementType() { return ::cppu::UnoType< Pair< Any, Any > >::get(); } - sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::hasElements() { ComponentMethodGuard aGuard( *this ); return m_aData.m_pValues->empty(); } - OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL EnumerableMap::getImplementationName( ) { return getImplementationName_static(); } - sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) { return cppu::supportsService(this, _serviceName); } - Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } @@ -711,14 +711,14 @@ namespace comphelper } - sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.hasMoreElements(); } - Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL MapEnumeration::nextElement( ) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.nextElement(); diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index d501dd9dadd5..c5e49a6555c8 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -51,7 +51,7 @@ OEnumerationByName::~OEnumerationByName() } -sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -69,7 +69,6 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -91,7 +90,6 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) void SAL_CALL OEnumerationByName::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -150,7 +148,7 @@ OEnumerationByIndex::~OEnumerationByIndex() } -sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -168,7 +166,6 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -190,7 +187,6 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) void SAL_CALL OEnumerationByIndex::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -246,7 +242,7 @@ OAnyEnumeration::~OAnyEnumeration() } -sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -255,7 +251,6 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeEx css::uno::Any SAL_CALL OAnyEnumeration::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ! hasMoreElements()) throw css::container::NoSuchElementException(); diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 0332cd29f90c..ed10fbb72076 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -38,32 +38,20 @@ namespace comphelper explicit NameContainer( css::uno::Type aType ); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual 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; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; private: SvGenericNameContainerMapImpl maProperties; @@ -86,8 +74,6 @@ NameContainer::NameContainer( css::uno::Type aType ) // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, - WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -101,8 +87,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl } void SAL_CALL NameContainer::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, - RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -116,8 +100,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, - WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -134,8 +116,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE // XNameAccess Any SAL_CALL NameContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, - RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -147,7 +127,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -155,7 +134,6 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -164,7 +142,6 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) } sal_Bool SAL_CALL NameContainer::hasElements( ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -172,7 +149,6 @@ sal_Bool SAL_CALL NameContainer::hasElements( ) } Type SAL_CALL NameContainer::getElementType() - throw( RuntimeException, std::exception ) { return maType; } diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 6917380aa7b9..06b23432bbe9 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -98,37 +98,26 @@ public: const Reference< XComponentContext >& rContext ); // Methods of XEventAttacherManager - virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL insertEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) - throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) override; - virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; + virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) override; + virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) override; + virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) override; + virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) override; + virtual void SAL_CALL insertEntry(sal_Int32 Index) override; + virtual void SAL_CALL removeEntry(sal_Int32 Index) override; + virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) override; + virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) override; + virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) override; + virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) override; + virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) override; // Methods of XPersistObject - virtual OUString SAL_CALL getServiceName() throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) override; + virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) override; private: /// @throws Exception - Reference< XIdlReflection > getReflection() throw( Exception ); + Reference< XIdlReflection > getReflection(); /** checks if <arg>_nIndex</arg> is a valid index, throws an <type>IllegalArgumentException</type> if not @param _nIndex @@ -149,18 +138,17 @@ class AttacherAllListener_Impl : public WeakImplHelper< XAllListener > OUString aScriptCode; /// @throws CannotConvertException - void convertToEventReturn( Any & rRet, const Type & rRetType ) - throw( CannotConvertException ); + void convertToEventReturn( Any & rRet, const Type & rRetType ); public: AttacherAllListener_Impl( ImplEventAttacherManager* pManager_, const OUString &rScriptType_, const OUString & rScriptCode_ ); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL firing(const AllEventObject& Event) override; + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& Source) override; }; @@ -179,7 +167,6 @@ AttacherAllListener_Impl::AttacherAllListener_Impl // Methods of XAllListener void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) - throw( RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = static_cast<OWeakObject *>(mxManager.get()); // get correct XInterface @@ -199,7 +186,6 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) // Convert to the standard event return void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rRetType ) - throw( CannotConvertException ) { // no return value? Set to the specified values if( rRet.getValueType().getTypeClass() == TypeClass_VOID ) @@ -244,7 +230,6 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR // Methods of XAllListener Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Event ) - throw( InvocationTargetException, RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = static_cast<OWeakObject *>(mxManager.get()); // get correct XInterface @@ -340,14 +325,12 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even // Methods of XEventListener void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& ) - throw( RuntimeException, std::exception ) { // It is up to the container to release the object } // Constructor method for EventAttacherManager Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XComponentContext > & rxContext ) - throw( Exception ) { Reference< XIntrospection > xIntrospection = theIntrospection::get( rxContext ); return new ImplEventAttacherManager( xIntrospection, rxContext ); @@ -380,7 +363,7 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect } } -Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exception ) +Reference< XIdlReflection > ImplEventAttacherManager::getReflection() { Guard< Mutex > aGuard( aLock ); // Do we already have a service? If not, create one. @@ -407,7 +390,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent sal_Int32 nIndex, const ScriptEventDescriptor& ScriptEvent ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -445,7 +427,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& ScriptEvents ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -471,7 +452,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent const OUString& EventMethod, const OUString& ToRemoveListenerParam ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -506,7 +486,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); @@ -521,7 +500,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 ) @@ -536,7 +514,6 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); @@ -550,7 +527,6 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); @@ -559,7 +535,6 @@ Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEv void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any & Helper) - throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 || !xObject.is() ) @@ -621,7 +596,6 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); //return; @@ -659,14 +633,12 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference } void SAL_CALL ImplEventAttacherManager::addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.addInterface( aListener ); } void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.removeInterface( aListener ); @@ -675,13 +647,11 @@ void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XS // Methods of XPersistObject OUString SAL_CALL ImplEventAttacherManager::getServiceName() - throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.uno.script.EventAttacherManager" ); } void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStream >& OutStream) - throw( IOException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); // Don't run without XMarkableStream @@ -721,7 +691,6 @@ void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStre } void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream >& InStream) - throw( IOException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); // Don't run without XMarkableStream diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index 15c2c9476b6e..8378304f6520 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -36,7 +36,6 @@ OSelectionChangeListener::~OSelectionChangeListener() void OSelectionChangeListener::_disposing(const EventObject&) - throw (RuntimeException, std::exception) { // nothing to do here } @@ -82,7 +81,7 @@ void OSelectionChangeMultiplexer::unlock() // XEventListener -void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) +void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -101,7 +100,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour // XSelectionChangeListener -void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) throw( RuntimeException, std::exception) +void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) { if (m_pListener && !locked()) m_pListener->_selectionChanged(_rEvent); diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 4d97b8049984..a5211d6f3af9 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -40,7 +40,7 @@ namespace comphelper } - bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException) + bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -51,7 +51,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocation( ) throw (RuntimeException) + Point SAL_CALL OCommonAccessibleComponent::getLocation( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -59,7 +59,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( ) throw (RuntimeException) + Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( ) { OExternalLockGuard aGuard( this ); @@ -79,7 +79,7 @@ namespace comphelper } - Size SAL_CALL OCommonAccessibleComponent::getSize( ) throw (RuntimeException) + Size SAL_CALL OCommonAccessibleComponent::getSize( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -87,7 +87,7 @@ namespace comphelper } - Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( ) throw (RuntimeException) + Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( ) { OExternalLockGuard aGuard( this ); return implGetBounds(); @@ -104,31 +104,31 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleComponentHelper::getLocation( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleComponentHelper::getLocation( ) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleComponentHelper::getSize( ) throw (RuntimeException, std::exception) + Size SAL_CALL OAccessibleComponentHelper::getSize( ) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) throw (RuntimeException, std::exception) + Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) { return OCommonAccessibleComponent::getBounds( ); } @@ -144,31 +144,31 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) throw (RuntimeException, std::exception) + Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) throw (RuntimeException, std::exception) + Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) { return OCommonAccessibleComponent::getBounds( ); } diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index bbc4102c10a8..0fa19a2ef05c 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -119,7 +119,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -142,7 +142,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -223,7 +223,7 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -269,7 +269,7 @@ namespace comphelper } - Locale SAL_CALL OAccessibleContextHelper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL OAccessibleContextHelper::getLocale( ) { // simply ask the parent Reference< XAccessible > xParent = getAccessibleParent(); diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index 72fae780e79f..72ce3b74657c 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx @@ -50,7 +50,7 @@ namespace comphelper } - void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) throw (RuntimeException) + void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -58,7 +58,7 @@ namespace comphelper } - void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) throw (RuntimeException) + void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -71,7 +71,7 @@ namespace comphelper // XAccessibleKeyBinding - sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -79,7 +79,7 @@ namespace comphelper } - Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 5daa1c2264d1..fe5f47b97482 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -36,31 +36,31 @@ namespace comphelper OCommonAccessibleSelection::~OCommonAccessibleSelection() {} - void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) { implSelect( nChildIndex, true ); } - bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) { return implIsSelected( nChildIndex ); } - void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false ); } - void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true ); } - sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) { sal_Int32 nRet = 0; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -78,7 +78,7 @@ namespace comphelper } - Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -96,7 +96,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { implSelect( nSelectedChildIndex, false ); } @@ -111,55 +111,55 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() throw ( RuntimeException ) + Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() { return this; } - void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ); } - void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::clearAccessibleSelection(); } - void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAllAccessibleChildren(); } - sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ); } - void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 29ca9c6f8e38..2bb088dc2595 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -222,7 +222,7 @@ namespace comphelper } - sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -233,13 +233,13 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getCharacterCount() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getCharacterCount() { return implGetText().getLength(); } - OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) + OUString OCommonAccessibleText::getSelectedText() { OUString sText; sal_Int32 nStartIndex; @@ -259,7 +259,7 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionStart() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getSelectionStart() { sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -270,7 +270,7 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionEnd() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getSelectionEnd() { sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -281,13 +281,13 @@ namespace comphelper } - OUString OCommonAccessibleText::getText() throw (RuntimeException) + OUString OCommonAccessibleText::getText() { return implGetText(); } - OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OUString sText( implGetText() ); @@ -301,7 +301,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -405,7 +405,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -529,7 +529,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -772,7 +772,7 @@ namespace comphelper // XAccessibleText - sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -780,7 +780,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getCharacterCount() { OExternalLockGuard aGuard( this ); @@ -788,7 +788,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException, std::exception) + OUString OAccessibleTextHelper::getSelectedText() { OExternalLockGuard aGuard( this ); @@ -796,7 +796,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getSelectionStart() { OExternalLockGuard aGuard( this ); @@ -804,7 +804,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getSelectionEnd() { OExternalLockGuard aGuard( this ); @@ -812,7 +812,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getText() throw (RuntimeException, std::exception) + OUString OAccessibleTextHelper::getText() { OExternalLockGuard aGuard( this ); @@ -820,7 +820,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -828,7 +828,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -836,7 +836,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -844,7 +844,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 41fb4f540fed..a28fea7b7f11 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -235,7 +235,7 @@ namespace comphelper } - void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) { // this should come from one of the inner XAccessible's of our children Reference< XAccessible > xSource( _rSource.Source, UNO_QUERY ); @@ -295,7 +295,7 @@ namespace comphelper IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation ) - Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any OAccessibleWrapper::queryInterface( const Type& _rType ) { // #111089# instead of the inner XAccessible the proxy XAccessible must be returned Any aReturn = OAccessibleWrapper_Base::queryInterface( _rType ); @@ -318,7 +318,7 @@ namespace comphelper } - Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) { // see if the context is still alive (we cache it) Reference< XAccessibleContext > xContext = m_aContext; @@ -383,7 +383,7 @@ namespace comphelper } - Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) { Any aReturn = OComponentProxyAggregationHelper::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -395,13 +395,13 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base ) - sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) { return m_xInnerContext->getAccessibleChildCount(); } - Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) { // get the child of the wrapped component Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i ); @@ -409,7 +409,7 @@ namespace comphelper } - Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet( ) { return m_xInnerContext->getAccessibleRelationSet(); // TODO: if this relation set would contain relations to siblings, we would normally need @@ -417,7 +417,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) { #if OSL_DEBUG_LEVEL > 0 if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) @@ -455,7 +455,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OAccessibleContextWrapperHelper::dispose() { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -473,7 +473,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) { // simply disambiguate this OComponentProxyAggregationHelper::disposing( _rEvent ); @@ -501,74 +501,74 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) { return baseGetAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) { return baseGetAccessibleChild( i ); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) { return m_xParentAccessible; } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) { return m_xInnerContext->getAccessibleIndexInParent(); } - sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) { return m_xInnerContext->getAccessibleRole(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) { return m_xInnerContext->getAccessibleDescription(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) { return m_xInnerContext->getAccessibleName(); } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) { return baseGetAccessibleRelationSet(); } - Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) { return m_xInnerContext->getAccessibleStateSet(); } - Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) { return m_xInnerContext->getLocale(); } - void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) + void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) { if ( m_nNotifierClient ) AccessibleEventNotifier::addEvent( m_nNotifierClient, _rEvent ); } - void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_nNotifierClient ) @@ -577,7 +577,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_nNotifierClient ) @@ -592,7 +592,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::disposing() throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapper::disposing() { AccessibleEventNotifier::TClientId nClientId( 0 ); diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 1c4096f38e08..1a546598d827 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -74,7 +74,7 @@ namespace comphelper } - sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException, std::exception) + sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) { sal_Int64 nReturn( 0 ); diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 5d14d6772591..6847f2f7cc00 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -238,14 +238,12 @@ void comphelper::ConfigurationListener::dispose() } void SAL_CALL comphelper::ConfigurationListener::disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) { dispose(); } void SAL_CALL comphelper::ConfigurationListener::propertyChange( css::beans::PropertyChangeEvent const &rEvt ) - throw (css::uno::RuntimeException, std::exception) { // Code is commonly used inside the SolarMutexGuard // so to avoid concurrent writes to the property, diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index 3ebcde4e82f7..105956c1692d 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -46,7 +46,7 @@ namespace comphelper { class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort > { public: - virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override {} + virtual void SAL_CALL select() override {} }; @@ -57,16 +57,16 @@ public: inline bool isSelected() const { return mbSelected; } - virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override { mbSelected = true; } + virtual void SAL_CALL select() override { mbSelected = true; } - virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maPassword = rPass; } - virtual OUString SAL_CALL getPassword() throw( RuntimeException, std::exception ) override { return maPassword; } + virtual void SAL_CALL setPassword( const OUString& rPass ) override { maPassword = rPass; } + virtual OUString SAL_CALL getPassword() override { return maPassword; } - virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maModifyPassword = rPass; } - virtual OUString SAL_CALL getPasswordToModify() throw( RuntimeException, std::exception ) override { return maModifyPassword; } + virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) override { maModifyPassword = rPass; } + virtual OUString SAL_CALL getPasswordToModify() override { return maModifyPassword; } - virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) throw( RuntimeException, std::exception ) override { mbReadOnly = bReadOnly; } - virtual sal_Bool SAL_CALL getRecommendReadOnly() throw( RuntimeException, std::exception ) override { return mbReadOnly; } + virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) override { mbReadOnly = bReadOnly; } + virtual sal_Bool SAL_CALL getRecommendReadOnly() override { return mbReadOnly; } private: OUString maPassword; @@ -100,12 +100,12 @@ OUString SimplePasswordRequest::getPassword() const return mxPassword->getPassword(); } -Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::exception ) +Any SAL_CALL SimplePasswordRequest::getRequest() { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException, std::exception ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() { return { mxAbort.get(), mxPassword.get() }; } @@ -162,12 +162,12 @@ bool DocPasswordRequest::getRecommendReadOnly() const return mxPassword->getRecommendReadOnly(); } -Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exception ) +Any SAL_CALL DocPasswordRequest::getRequest() { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException, std::exception ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() { return { mxAbort.get(), mxPassword.get() }; } diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index 424f86c093df..e90cd95f0cf8 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -47,7 +47,7 @@ OSimpleLogRing::~OSimpleLogRing() // XSimpleLogRing -void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException, std::exception) +void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -63,7 +63,7 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno:: } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -82,7 +82,7 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno: // XInitialization -void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) +void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -107,17 +107,17 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu } // XServiceInfo -OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL OSimpleLogRing::getImplementationName() { return OUString("com.sun.star.comp.logging.SimpleLogRing"); } -sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() { return { "com.sun.star.logging.SimpleLogRing" }; } diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 9a7c7a957094..b4cffa8b85cf 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -49,16 +49,16 @@ public: virtual ~OSimpleLogRing() override; // XSimpleLogRing - virtual void SAL_CALL logString( const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL logString( const OUString& aMessage ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index 0307e4c48283..2eac315808f0 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.cxx @@ -25,7 +25,7 @@ namespace comphelper _rxListener) : m_xListener(_rxListener) { } - void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) { css::uno::Reference< css::lang::XEventListener> xRef = m_xListener; if(xRef.is()) diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index e6a39e876c93..97671aca372c 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -67,7 +67,6 @@ OInstanceLocker::~OInstanceLocker() // XComponent void SAL_CALL OInstanceLocker::dispose() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -89,7 +88,6 @@ void SAL_CALL OInstanceLocker::dispose() void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -103,7 +101,6 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -113,7 +110,6 @@ void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang:: // XInitialization void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -181,19 +177,16 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo OUString SAL_CALL OInstanceLocker::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.embed.InstanceLocker" ); } sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.embed.InstanceLocker" ); return uno::Sequence< OUString >( &aServiceName, 1 ); @@ -262,7 +255,6 @@ void OLockListener::Dispose() // XEventListener void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -287,7 +279,6 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) // XCloseListener void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool ) - throw (util::CloseVetoException, uno::RuntimeException, std::exception) { // GetsOwnership parameter is always ignored, the user of the service must close the object always ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -317,7 +308,6 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -348,7 +338,6 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) // XTerminateListener void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) - throw (frame::TerminationVetoException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) ) @@ -377,7 +366,6 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index df6c39cedd7a..cb6d229fc2dd 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -57,17 +57,17 @@ public: virtual ~OInstanceLocker() override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; @@ -98,15 +98,15 @@ public: void Dispose(); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XCloseListener - virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; }; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 62f5bd2b84a5..8f07dafb638f 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -28,13 +28,13 @@ namespace comphelper using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; - void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) throw (RuntimeException, std::exception) + void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) { m_sPassword = Password; } - OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OInteractionPassword::getPassword( ) { return m_sPassword; } @@ -61,13 +61,13 @@ namespace comphelper } - Any SAL_CALL OInteractionRequest::getRequest( ) throw(RuntimeException, std::exception) + Any SAL_CALL OInteractionRequest::getRequest( ) { return m_aRequest; } - Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) throw(RuntimeException, std::exception) + Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) { return comphelper::containerToSequence(m_aContinuations); } diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index d0d86d751696..1faf639b16fb 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -63,8 +63,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) ::sal_Int32 SAL_CALL NumberedCollection::leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -100,8 +98,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -139,8 +135,6 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber) void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -163,7 +157,6 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe OUString SAL_CALL NumberedCollection::getUntitledPrefix() - throw (css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index a8895285a0fb..37b1d0d02882 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -35,7 +35,6 @@ namespace comphelper // XRestartManager void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { if ( !m_xContext.is() ) throw uno::RuntimeException(); @@ -77,7 +76,6 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeInitialized ) - throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -90,7 +88,6 @@ sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeIni // XCallback void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) - throw ( uno::RuntimeException, std::exception ) { try { @@ -132,17 +129,17 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo -OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() { return OUString("com.sun.star.comp.task.OfficeRestartManager"); } -sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() { return { "com.sun.star.comp.task.OfficeRestartManager" }; } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 02a65efd5f61..cfada99c858a 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -49,16 +49,16 @@ public: {} // XRestartManager - virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) override; + virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) override; // XCallback - virtual void SAL_CALL notify( const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notify( const css::uno::Any& aData ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 1f2181f6c13c..764dc92d91f1 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -65,13 +65,13 @@ namespace comphelper } - Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) { return m_xProxyAggregate.is() ? m_xProxyAggregate->queryAggregation( _rType ) : Any(); } - Sequence< Type > SAL_CALL OProxyAggregation::getTypes( ) throw (RuntimeException) + Sequence< Type > SAL_CALL OProxyAggregation::getTypes( ) { Sequence< Type > aTypes; if ( m_xProxyAggregate.is() ) @@ -122,7 +122,7 @@ namespace comphelper } - Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) { Any aReturn( BASE::queryInterface( _rType ) ); if ( !aReturn.hasValue() ) @@ -149,7 +149,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) { if ( _rSource.Source == m_xInner ) { // it's our inner context which is dying -> dispose ourself @@ -161,7 +161,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OComponentProxyAggregationHelper::dispose() { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -204,7 +204,7 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation ) - Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) { Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() ); @@ -217,7 +217,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) { // Simply disambiguate---this is necessary for MSVC to distinguish // "disposing(EventObject)" from "disposing()"; but it is also a good @@ -228,14 +228,14 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::disposing() throw (RuntimeException) + void SAL_CALL OComponentProxyAggregation::disposing() { // call the dispose-functionality of the base, which will dispose our aggregated component OComponentProxyAggregationHelper::dispose(); } - void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OComponentProxyAggregation::dispose() { // simply disambiguate WeakComponentImplHelperBase::dispose(); diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 906df93f12f9..6cdf7b41bf94 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -47,21 +47,16 @@ public: const Factory& operator=(const Factory&) = delete; // XServiceInfo: - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override; + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XSingleComponentFactory: virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithContext( - uno::Reference<uno::XComponentContext> const& xContext ) - throw (uno::Exception, std::exception) override; + uno::Reference<uno::XComponentContext> const& xContext ) override; virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithArgumentsAndContext( uno::Sequence<uno::Any> const& args, - uno::Reference<uno::XComponentContext> const& xContext ) - throw (uno::Exception, std::exception) override; + uno::Reference<uno::XComponentContext> const& xContext ) override; private: virtual ~Factory() override; @@ -75,19 +70,16 @@ ServiceDecl::Factory::~Factory() // XServiceInfo: OUString ServiceDecl::Factory::getImplementationName() - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getImplementationName(); } sal_Bool ServiceDecl::Factory::supportsService( OUString const& name ) - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.supportsService(name); } uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getSupportedServiceNames(); } @@ -95,7 +87,6 @@ uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames() // XSingleComponentFactory: uno::Reference<uno::XInterface> ServiceDecl::Factory::createInstanceWithContext( uno::Reference<uno::XComponentContext> const& xContext ) - throw (uno::Exception, std::exception) { return m_rServiceDecl.m_createFunc( m_rServiceDecl, uno::Sequence<uno::Any>(), xContext ); @@ -105,7 +96,6 @@ uno::Reference<uno::XInterface> ServiceDecl::Factory::createInstanceWithArgumentsAndContext( uno::Sequence<uno::Any > const& args, uno::Reference<uno::XComponentContext> const& xContext ) - throw (uno::Exception, std::exception) { return m_rServiceDecl.m_createFunc( m_rServiceDecl, args, xContext ); diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 838f4fec11eb..87f4c343c3f9 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -26,13 +26,13 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() { return OUString(); } /** the base implementation has no supported services */ -css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() { css::uno::Sequence< OUString> aSeq(0); return aSeq; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 394a0aab578f..b5fea9884aa4 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -53,7 +53,6 @@ namespace comphelper { uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext(); @@ -63,7 +62,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory( uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStorageFactory( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext(); @@ -73,7 +71,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< embed::XStorage > xTempStorage( GetStorageFactory( rxContext )->createInstance(), uno::UNO_QUERY ); @@ -88,7 +85,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= aURL; @@ -107,7 +103,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= aURL; @@ -139,7 +134,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromInputStream( const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xStream; @@ -158,7 +152,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream( const uno::Reference < io::XStream >& xStream, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xStream; @@ -176,7 +169,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream( void OStorageHelper::CopyInputToOutput( const uno::Reference< io::XInputStream >& xInput, const uno::Reference< io::XOutputStream >& xOutput ) - throw ( uno::Exception ) { static const sal_Int32 nConstBufferSize = 32000; @@ -201,7 +193,6 @@ void OStorageHelper::CopyInputToOutput( uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( const OUString& aURL, const uno::Reference< uno::XComponentContext >& context ) - throw ( uno::Exception ) { uno::Reference< io::XInputStream > xInputStream = ucb::SimpleFileAccess::create(context)->openFileRead( aURL ); if ( !xInputStream.is() ) @@ -214,7 +205,6 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( void OStorageHelper::SetCommonStorageEncryptionData( const uno::Reference< embed::XStorage >& xStorage, const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( uno::Exception ) { uno::Reference< embed::XEncryptionProtectedSource2 > xEncrSet( xStorage, uno::UNO_QUERY ); if ( !xEncrSet.is() ) @@ -226,7 +216,6 @@ void OStorageHelper::SetCommonStorageEncryptionData( sal_Int32 OStorageHelper::GetXStorageFormat( const uno::Reference< embed::XStorage >& xStorage ) - throw ( uno::Exception, std::exception ) { uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -293,7 +282,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); aProps[0].Name = "StorageFormat"; @@ -318,7 +306,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext, bool bRepairStorage, bool bUseBufferedStream ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); sal_Int32 nPos = 0; @@ -361,7 +348,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, bool bRepairStorage, bool bUseBufferedStream ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); sal_Int32 nPos = 0; diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index e8ccfedbac18..4f92aa15c319 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -100,7 +100,7 @@ bool getBOOL(const Any& _rAny) } -sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException) +sal_Int32 getEnumAsINT32(const Any& _rAny) { sal_Int32 nReturn = 0; if (! ::cppu::enum2int(nReturn,_rAny) ) diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index 9db7ba1a5fc3..1aadadaa6b7f 100644 --- a/comphelper/source/misc/weak.cxx +++ b/comphelper/source/misc/weak.cxx @@ -34,7 +34,7 @@ OWeakTypeObject::~OWeakTypeObject() { } -Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) { if( rType == cppu::UnoType<XTypeProvider>::get() ) return Any( Reference< XTypeProvider >(this) ); @@ -52,12 +52,12 @@ void SAL_CALL OWeakTypeObject::release() throw () ::cppu::OWeakObject::release(); } -Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( ) throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( ) { return Sequence< Type >(); } -Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) throw (RuntimeException, std::exception) +Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) { return Sequence< ::sal_Int8 >(); } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 6342182b8c6b..6d6e1de7cf19 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -100,7 +100,6 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() - throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pOfficeBrandDir ); @@ -110,7 +109,6 @@ OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() - throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pUserDir ); @@ -121,7 +119,6 @@ OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) - throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -157,7 +154,6 @@ OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) - throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -195,7 +191,6 @@ OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.util.OfficeInstallationDirectories"); } @@ -203,7 +198,6 @@ OfficeInstallationDirectories::getImplementationName() // virtual sal_Bool SAL_CALL OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -211,7 +205,6 @@ OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.util.OfficeInstallationDirectories" }; } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 20fcc6b6ca92..b1b235622a73 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -49,28 +49,21 @@ public: // XOfficeInstallationDirectories virtual OUString SAL_CALL - getOfficeInstallationDirectoryURL() - throw (css::uno::RuntimeException, std::exception) override; + getOfficeInstallationDirectoryURL() override; virtual OUString SAL_CALL - getOfficeUserDataDirectoryURL() - throw (css::uno::RuntimeException, std::exception) override; + getOfficeUserDataDirectoryURL() override; virtual OUString SAL_CALL - makeRelocatableURL( const OUString& URL ) - throw (css::uno::RuntimeException, std::exception) override; + makeRelocatableURL( const OUString& URL ) override; virtual OUString SAL_CALL - makeAbsoluteURL( const OUString& URL ) - throw (css::uno::RuntimeException, std::exception) override; + makeAbsoluteURL( const OUString& URL ) override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; private: void initDirs(); diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 1f7d8d92c992..846fa7acb87b 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -45,13 +45,11 @@ ChainablePropertySet::~ChainablePropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { return mxInfo.get(); } void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -69,7 +67,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN } Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -90,33 +87,27 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa } void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues) - throw (PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -150,7 +141,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString > } Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence< OUString >& rPropertyNames) - throw (RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -184,26 +174,22 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence< } void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find( PropertyName ); if( aIter == mxInfo->maMap.end()) @@ -219,7 +205,6 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& P } Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -245,7 +230,6 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons } void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -255,7 +239,6 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPrope } Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -265,31 +248,26 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rProperty } void ChainablePropertySet::_preGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_postGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException, WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 4a2c34789810..00f6720324b0 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -52,7 +52,6 @@ void ChainablePropertySetInfo::remove( const OUString& aName ) } Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() - throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -74,7 +73,6 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() } Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -91,7 +89,6 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r } sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index c6f1477480de..f3f3374851b1 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -75,7 +75,6 @@ MasterPropertySet::~MasterPropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { return mxInfo.get(); } @@ -88,7 +87,6 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) } void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -122,7 +120,6 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -158,32 +155,27 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) - throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -247,7 +239,6 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -311,26 +302,22 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O } void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find( PropertyName ); if( aIter == mxInfo->maMap.end()) @@ -366,7 +353,6 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop } Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -411,7 +397,6 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S } void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -421,7 +406,6 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rProperty } Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -431,31 +415,26 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyNam } void MasterPropertySet::_preGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_postGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException, WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); Any aAny; diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 1db09060c317..35a9a5faee1d 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -61,7 +61,6 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() - throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -83,7 +82,6 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() } Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -101,7 +99,6 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam } sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 6ee1da2bbd55..93ce85d3779a 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -58,30 +58,30 @@ namespace comphelper cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener; protected: - virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) override; - virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw( UnknownPropertyException, WrappedTargetException ) override; + virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) override; + virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override; public: explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception) override; - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception) override; + virtual Any SAL_CALL queryAggregation( const Type & rType ) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes( ) throw( RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes( ) override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) 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; // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; }; } @@ -93,7 +93,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -115,7 +115,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPr } } -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); @@ -140,7 +140,6 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& } void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { ResettableMutexGuard aGuard( maMutex ); @@ -166,7 +165,6 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, } void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, Any* pValue ) - throw( UnknownPropertyException, WrappedTargetException ) { MutexGuard aGuard( maMutex ); @@ -182,13 +180,11 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry* // XInterface Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType ) - throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) - throw(RuntimeException, std::exception) { Any aAny; @@ -217,7 +213,6 @@ void SAL_CALL GenericPropertySet::release() throw() } uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); @@ -232,24 +227,22 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL GenericPropertySet::getImplementationName() { return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" ); } Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) - throw( RuntimeException, std::exception ) { Sequence<OUString> aSNS { "com.sun.star.beans.XPropertySet" }; return aSNS; diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 066052b3f1d3..540c0a2f8dfc 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -74,7 +74,7 @@ namespace comphelper IMPLEMENT_FORWARD_XINTERFACE2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase ) - void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) { Sequence< Type > aTypes; bool AllowEmptyPropertyName(false); @@ -112,17 +112,17 @@ namespace comphelper } } - OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL OPropertyBag::getImplementationName() { return OUString( "com.sun.star.comp.comphelper.OPropertyBag" ); } - sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) { return { "com.sun.star.beans.PropertyBag" }; } @@ -163,40 +163,36 @@ namespace comphelper sal_Bool SAL_CALL OPropertyBag::isModified() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_isModified; } void SAL_CALL OPropertyBag::setModified( sal_Bool bModified ) - throw (PropertyVetoException, RuntimeException, std::exception) { setModifiedImpl(bModified, false); } void SAL_CALL OPropertyBag::addModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException, std::exception) { m_NotifyListeners.addInterface(xListener); } void SAL_CALL OPropertyBag::removeModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException, std::exception) { m_NotifyListeners.removeInterface(xListener); } - Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ); } - sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -204,7 +200,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::insert( const Any& _element ) { // This is a workaround for addProperty not being able to add default-void properties. // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack. @@ -231,7 +227,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -239,7 +235,7 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -247,7 +243,7 @@ namespace comphelper } - Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException, std::exception) + Type SAL_CALL OPropertyBag::getElementType( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -255,7 +251,7 @@ namespace comphelper } - sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::hasElements( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -268,12 +264,12 @@ namespace comphelper m_aDynamicProperties.getFastPropertyValue( _nHandle, _rValue ); } - sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, UnknownPropertyException) + sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue ); } - void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) + void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { m_aDynamicProperties.setFastPropertyValue( nHandle, rValue ); } @@ -314,7 +310,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -337,7 +333,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -380,7 +376,7 @@ namespace comphelper } - Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException, std::exception) + Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -513,7 +509,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_setPropertyValues_throw( _rProps ); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index ca2df4a9fa0a..678c457b563f 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -100,64 +100,59 @@ namespace comphelper /** === begin UNO interface implementations == **/ // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XModifiable: - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const css::uno::Reference< - css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener > & xListener) override; virtual void SAL_CALL removeModifyListener( const css::uno::Reference< - css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener > & xListener) override; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override; + virtual void SAL_CALL removeProperty( const OUString& Name ) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) override { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) override { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) override { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) override { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet - virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) override; + virtual void SAL_CALL insert( const css::uno::Any& aElement ) override; + virtual void SAL_CALL remove( const css::uno::Any& aElement ) override; // XEnumerationAccess (base of XSet) - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; // XElementAccess (base of XEnumerationAccess) - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // UNO interface implementations // XPropertyState @@ -168,8 +163,8 @@ namespace comphelper // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // IEventNotificationHook diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index acc253b2ca17..35c6a5f9f917 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -141,7 +141,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper: } -Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException ) +Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) { const Property* pProperty = findPropertyByName( _rPropertyName ); @@ -273,7 +273,7 @@ namespace internal /// actually forwards a property value to the aggregate /// /// @throws Exception - void doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ); + void doForward( sal_Int32 _nHandle, const Any& _rValue ); sal_Int32 getCurrentlyForwardedProperty( ) const { return m_nCurrentlyForwarding; } }; @@ -298,7 +298,7 @@ namespace internal } - void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) { OSL_ENSURE( m_rAggregationHelper.m_xAggregateSet.is(), "PropertyForwarder::doForward: no property set!" ); if ( m_rAggregationHelper.m_xAggregateSet.is() ) @@ -339,7 +339,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper() } -css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const css::uno::Type& _rType) { css::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); @@ -370,7 +370,7 @@ void OPropertySetAggregationHelper::disposing() } -void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) @@ -378,7 +378,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObj } -void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) throw( css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !"); @@ -426,7 +426,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Se } -void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent) throw( css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !"); @@ -438,7 +438,6 @@ void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::Pr void OPropertySetAggregationHelper::setAggregation(const css::uno::Reference< css::uno::XInterface >& _rxDelegate) - throw( css::lang::IllegalArgumentException ) { osl::MutexGuard aGuard(rBHelper.rMutex); @@ -478,7 +477,6 @@ void OPropertySetAggregationHelper::startListening() void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener>& _rxListener) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -488,7 +486,6 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener>& _rxListener) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -498,7 +495,6 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const css::uno::Sequence< OUString >& _rPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener>& _rxListener) - throw( css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener); if (!m_bListening) @@ -525,9 +521,6 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const css::uno::Any& _rValue) - throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -567,9 +560,6 @@ void OPropertySetAggregationHelper::getFastPropertyValue( css::uno::Any& rValue, css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -592,7 +582,6 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_I void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) - throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !"); OSL_ENSURE( !rBHelper.bDisposed, "OPropertySetAggregationHelper::setPropertyValues : object is disposed" ); @@ -767,7 +756,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) - throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName ); @@ -792,7 +780,6 @@ css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertySta void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) - throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName); @@ -825,7 +812,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -846,7 +832,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O return getPropertyDefaultByHandle(nHandle); } -sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; @@ -866,7 +852,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& return bModified; } -void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) +void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" ); if ( m_pForwarder->isResponsibleFor( _nHandle ) ) diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 813346270fc1..01674353465c 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -48,7 +48,7 @@ OPropertyContainer::~OPropertyContainer() } -Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std::exception) +Sequence< Type > OPropertyContainer::getBaseTypes() { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( @@ -60,21 +60,20 @@ Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std } -void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) { OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); } sal_Bool OPropertyContainer::convertFastPropertyValue( - Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException) + Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { return OPropertyContainerHelper::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue ); } void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception, std::exception) { OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue ); } diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 614a035f9166..5005fb626653 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -74,12 +74,12 @@ PropertySetHelper::~PropertySetHelper() throw() } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) { return mpImpl->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mpImpl->find( aPropertyName ); @@ -92,7 +92,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName _setPropertyValues( aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mpImpl->find( PropertyName ); @@ -108,29 +108,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) return aAny; } -void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { // todo } // XMultiPropertySet void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues ) - throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -160,7 +159,6 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OUString >& rPropertyNames) - throw (RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -192,23 +190,23 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OU return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) { PropertyMapEntry const * aEntries[2]; @@ -224,7 +222,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& Prop return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -257,7 +255,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) { PropertyMapEntry const *pEntry = mpImpl->find( PropertyName ); if( nullptr == pEntry ) @@ -266,7 +264,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) { PropertyMapEntry const * pEntry = mpImpl->find( aPropertyName ); if( nullptr == pEntry ) @@ -277,20 +275,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyNam void PropertySetHelper::_getPropertyStates( const comphelper::PropertyMapEntry**, PropertyState*) -throw (UnknownPropertyException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); } void PropertySetHelper::_setPropertyToDefault(const comphelper::PropertyMapEntry*) -throw (UnknownPropertyException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); } Any PropertySetHelper::_getPropertyDefault(const comphelper::PropertyMapEntry*) -throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 0673b6ffe93b..a77a32799c7d 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -44,7 +44,7 @@ public: const PropertyMap& getPropertyMap() const throw() { return maPropertyMap;} /// @throws UnknownPropertyException - Property getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ); + Property getPropertyByName( const OUString& aName ); bool hasPropertyByName( const OUString& aName ) throw(); private: @@ -106,7 +106,7 @@ std::vector< Property > const & PropertyMapImpl::getProperties() throw() } -Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ) +Property PropertyMapImpl::getPropertyByName( const OUString& aName ) { PropertyMap::iterator aIter = maPropertyMap.find( aName ); @@ -167,17 +167,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw() mpImpl->remove( aName ); } -Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(css::uno::RuntimeException, std::exception) +Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() { return comphelper::containerToSequence(mpImpl->getProperties()); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) { return mpImpl->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) { return mpImpl->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index b315a6662520..063cc79e35b4 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -51,7 +51,7 @@ namespace comphelper } - Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) { Any aReturn = OPropertyContainer::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -76,13 +76,13 @@ namespace comphelper } - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -135,13 +135,13 @@ namespace comphelper } - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index e10d85a0c343..5508677396b3 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -37,7 +37,6 @@ OPropertyChangeListener::~OPropertyChangeListener() void OPropertyChangeListener::_disposing(const EventObject&) - throw (RuntimeException, std::exception) { // nothing to do here } @@ -108,7 +107,7 @@ void OPropertyChangeMultiplexer::dispose() // XEventListener -void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) +void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -129,7 +128,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc // XPropertyChangeListener -void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException, std::exception) +void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) { if (m_pListener && !locked()) m_pListener->_propertyChanged(_rEvent); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 5272ebf725a1..e0830099b896 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -40,7 +40,7 @@ namespace comphelper // OPropertyStateHelper - css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) { css::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces @@ -76,7 +76,7 @@ namespace comphelper // XPropertyState - css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -88,7 +88,7 @@ namespace comphelper } - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -100,7 +100,7 @@ namespace comphelper } - css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -112,7 +112,7 @@ namespace comphelper } - css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const css::uno::Sequence< OUString >& _rPropertyNames) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const css::uno::Sequence< OUString >& _rPropertyNames) { sal_Int32 nLen = _rPropertyNames.getLength(); css::uno::Sequence< css::beans::PropertyState> aRet(nLen); @@ -184,7 +184,7 @@ namespace comphelper } - Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException, std::exception) + Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() { Sequence< Type > aOwnTypes( 2 ); aOwnTypes[0] = cppu::UnoType<XWeak>::get(); @@ -196,13 +196,13 @@ namespace comphelper ); } - Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception) + Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } - Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) + Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) { Any aReturn = OWeakObject::queryInterface( _rType ); if ( !aReturn.hasValue() ) diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index addb09306837..da162ef75c12 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -47,33 +47,33 @@ public: UNOMemoryStream(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XStream - virtual Reference< XInputStream > SAL_CALL getInputStream( ) throw (RuntimeException, std::exception) override; - virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException, std::exception) override; + virtual Reference< XInputStream > SAL_CALL getInputStream( ) override; + virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException, 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; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (IOException, 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; // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) 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 >& aData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; // XTruncate - virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate() override; private: std::vector< sal_Int8 > maData; @@ -86,34 +86,34 @@ UNOMemoryStream::UNOMemoryStream() } // XServiceInfo -OUString SAL_CALL UNOMemoryStream::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL UNOMemoryStream::getImplementationName() { return OUString("com.sun.star.comp.MemoryStream"); } -sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence<OUString> SAL_CALL UNOMemoryStream::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL UNOMemoryStream::getSupportedServiceNames() { return { "com.sun.star.comp.MemoryStream" }; } // XStream -Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) throw (RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) { return this; } -Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) throw (RuntimeException, std::exception) +Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) { return this; } // XInputStream -sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { if( nBytesToRead < 0 ) throw IOException(); @@ -133,12 +133,12 @@ sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_ return nBytesToRead; } -sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes( aData, nMaxBytesToRead ); } -void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) { if( nBytesToSkip < 0 ) throw IOException(); @@ -146,18 +146,18 @@ void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotCon mnCursor += std::min( nBytesToSkip, available() ); } -sal_Int32 SAL_CALL UNOMemoryStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::available() { return static_cast< sal_Int32 >( maData.size() ) - mnCursor; } -void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::closeInput() { mnCursor = 0; } // XSeekable -void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) { if( (location < 0) || (location > SAL_MAX_INT32) ) throw IllegalArgumentException("this implementation does not support more than 2GB!", static_cast<OWeakObject*>(this), 0 ); @@ -172,18 +172,18 @@ void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgument mnCursor = static_cast< sal_Int32 >( location ); } -sal_Int64 SAL_CALL UNOMemoryStream::getPosition() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL UNOMemoryStream::getPosition() { return static_cast< sal_Int64 >( mnCursor ); } -sal_Int64 SAL_CALL UNOMemoryStream::getLength() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL UNOMemoryStream::getLength() { return static_cast< sal_Int64 >( maData.size() ); } // XOutputStream -void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) { const sal_Int32 nBytesToWrite( aData.getLength() ); if( nBytesToWrite ) @@ -206,17 +206,17 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t } } -void SAL_CALL UNOMemoryStream::flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::flush() { } -void SAL_CALL UNOMemoryStream::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::closeOutput() { mnCursor = 0; } //XTruncate -void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::truncate() { maData.resize( 0 ); mnCursor = 0; diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 77e9ff6cfe31..defbdf3cc313 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -38,7 +38,6 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper() sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); @@ -63,7 +62,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 } -sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); @@ -75,7 +74,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_ } -void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -93,7 +92,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( cs } -sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::available() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -123,7 +122,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnect } -void SAL_CALL OSLInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::closeInput() { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this)); @@ -143,7 +142,7 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile): OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {} -void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) { sal_uInt64 nWritten; FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten); @@ -155,12 +154,12 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_I } -void SAL_CALL OSLOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::flush() { } -void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::closeOutput() { rFile.close(); } diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx index 7a39696f0497..2d14cd0aadb8 100644 --- a/comphelper/source/streaming/seekableinput.cxx +++ b/comphelper/source/streaming/seekableinput.cxx @@ -116,10 +116,6 @@ void OSeekableInputWrapper::PrepareCopy_Impl() // XInputStream sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -133,10 +129,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,10 +142,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -167,9 +155,6 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OSeekableInputWrapper::available() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,9 +168,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::available() void SAL_CALL OSeekableInputWrapper::closeInput() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -208,9 +190,6 @@ void SAL_CALL OSeekableInputWrapper::closeInput() // XSeekable void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -224,8 +203,6 @@ void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -239,8 +216,6 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() sal_Int64 SAL_CALL OSeekableInputWrapper::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index d9e372238637..9ed69589b730 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -53,24 +53,24 @@ public: const SequenceInputStreamService& operator=(const SequenceInputStreamService&) = delete; // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::io::XInputStream: - virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override; - virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override; + virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) override; + virtual ::sal_Int32 SAL_CALL readSomeBytes( 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; // css::io::XSeekable: - virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException, 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; // css::lang::XInitialization: - virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) override; private: virtual ~SequenceInputStreamService() override {} @@ -87,24 +87,24 @@ SequenceInputStreamService::SequenceInputStreamService() {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SequenceInputStreamService::getImplementationName() { return OUString ( "com.sun.star.comp.SequenceInputStreamService" ); } -sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() { uno::Sequence<OUString> s { "com.sun.star.io.SequenceInputStream" }; return s; } // css::io::XInputStream: -::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -113,7 +113,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi return m_xInputStream->readBytes( aData, nBytesToRead ); } -::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -122,7 +122,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } -void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -131,7 +131,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) return m_xInputStream->skipBytes( nBytesToSkip ); } -::sal_Int32 SAL_CALL SequenceInputStreamService::available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::available() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -140,7 +140,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) return m_xInputStream->available(); } -void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -152,7 +152,7 @@ void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeExcep } // css::io::XSeekable: -void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -161,7 +161,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u m_xSeekable->seek( location ); } -::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -170,7 +170,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u return m_xSeekable->getPosition(); } -::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -180,7 +180,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u } // css::lang::XInitialization: -void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) +void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 461cbc5d2563..d722ff9c14aa 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -48,17 +48,17 @@ public: const SequenceOutputStreamService& operator=(const SequenceOutputStreamService&) = delete; // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::io::XOutputStream: - virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; + virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; // css::io::XSequenceOutputStream: - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override; + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) override; private: virtual ~SequenceOutputStreamService() override {}; @@ -74,24 +74,24 @@ SequenceOutputStreamService::SequenceOutputStreamService() } // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SequenceOutputStreamService::getImplementationName() { return OUString("com.sun.star.comp.SequenceOutputStreamService"); } -sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() { uno::Sequence<OUString> s { "com.sun.star.io.SequenceOutputStream" }; return s; } // css::io::XOutputStream: -void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -101,7 +101,7 @@ void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sa m_aSequence = aData; } -void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::flush() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -110,7 +110,7 @@ void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException m_xOutputStream->flush(); }; -void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::closeOutput() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -121,7 +121,7 @@ void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeExc } // css::io::XSequenceOutputStream: -uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index d4672f602bfe..89625838132a 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -54,8 +54,6 @@ inline sal_Int32 SequenceInputStream::avail() // css::io::XInputStream sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -76,8 +74,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sa sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { // all data is available at once return readBytes(aData, nMaxBytesToRead); @@ -85,8 +81,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence<sal_Int8>& aData void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -103,7 +97,6 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL SequenceInputStream::available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,7 +105,6 @@ sal_Int32 SAL_CALL SequenceInputStream::available( ) void SAL_CALL SequenceInputStream::closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { if (m_nPos == -1) throw NotConnectedException(OUString(), *this); @@ -120,19 +112,19 @@ void SAL_CALL SequenceInputStream::closeInput( ) m_nPos = -1; } -void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) +void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) { if ( location > m_aData.getLength() || location < 0 || location > SAL_MAX_INT32 ) throw IllegalArgumentException(); m_nPos = (sal_Int32) location; } -sal_Int64 SAL_CALL SequenceInputStream::getPosition() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL SequenceInputStream::getPosition() { return m_nPos; } -sal_Int64 SAL_CALL SequenceInputStream::getLength( ) throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL SequenceInputStream::getLength( ) { return m_aData.getLength(); } @@ -152,7 +144,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double } -void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -192,7 +184,7 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD } -void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::flush( ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -203,7 +195,7 @@ void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, Buff } -void SAL_CALL OSequenceOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::closeOutput( ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index cefede87dfc9..64daa2a14320 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -53,17 +53,17 @@ struct AttributeList_Impl ::std::vector<struct TagAttribute_Impl> vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength() throw( css::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL AttributeList::getLength() { return (sal_Int16)(m_pImpl->vecAttribute.size()); } -OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size()) ) ? m_pImpl->vecAttribute[i].sName : OUString(); } -OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) { if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) { return m_pImpl->vecAttribute[i].sType; @@ -71,12 +71,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::Ru return OUString(); } -OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) ? m_pImpl->vecAttribute[i].sValue : OUString(); } -OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) { ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); @@ -88,7 +88,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( c return OUString(); } -OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) { ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); @@ -127,7 +127,7 @@ void AttributeList::Clear() m_pImpl->vecAttribute.clear(); } -css::uno::Reference< css::util::XCloneable > AttributeList::createClone() throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::util::XCloneable > AttributeList::createClone() { AttributeList *p = new AttributeList( *this ); diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index eebe3c2e6186..e1633fe3432b 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -72,14 +72,14 @@ public: explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly // XDocumentHandler - virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; @@ -89,14 +89,12 @@ namespace OFOPXMLHelper { static uno::Sequence<uno::Sequence< beans::StringPair>> ReadSequence_Impl( const uno::Reference<io::XInputStream>& xInStream, const OUString& aStringID, sal_uInt16 nFormat, - const uno::Reference<uno::XComponentContext>& xContext) -throw (uno::Exception); + const uno::Reference<uno::XComponentContext>& xContext); uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString & aStreamName, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { OUString aStringID = "_rels/" + aStreamName; return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, rContext ); @@ -106,7 +104,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence( uno::Sequence< uno::Sequence< beans::StringPair > > ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { OUString aStringID = "[Content_Types].xml"; return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, rContext ); @@ -117,7 +114,6 @@ void WriteRelationsInfoSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< uno::Sequence< beans::StringPair > >& aSequence, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !xOutStream.is() ) throw uno::RuntimeException(); @@ -178,7 +174,6 @@ void WriteContentSequence( const uno::Sequence< beans::StringPair >& aDefaultsSequence, const uno::Sequence< beans::StringPair >& aOverridesSequence, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !xOutStream.is() ) throw uno::RuntimeException(); @@ -239,7 +234,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !rContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) throw uno::RuntimeException(); @@ -287,19 +281,16 @@ uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl:: void SAL_CALL OFOPXMLHelper_Impl::startDocument() - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::endDocument() - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT ) { @@ -442,7 +433,6 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName ) - throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) { @@ -459,25 +449,21 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName ) void SAL_CALL OFOPXMLHelper_Impl::characters( const OUString& /*aChars*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::setDocumentLocator( const uno::Reference< css::xml::sax::XLocator >& /*xLocator*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } |