diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /lingucomponent | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'lingucomponent')
11 files changed, 66 insertions, 136 deletions
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index c363f3fd5170..4b1358392133 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -108,7 +108,6 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL Hyphenator::getLocales() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -228,7 +227,6 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() } sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -253,7 +251,6 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { int k = 0; @@ -499,7 +496,6 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { // Firstly we allow only one plus character before the hyphen to avoid to miss the right break point: for (int extrachar = 1; extrachar <= 2; extrachar++) @@ -537,7 +533,6 @@ static OString Win_GetShortPathName( const OUString &rLongPathName ) Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { PropertyHelper_Hyphenation& rHelper = GetPropHelper(); rHelper.SetTmpPropVals(aProperties); @@ -743,7 +738,6 @@ OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC /// @throws Exception Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Hyphenator); return xService; @@ -751,7 +745,6 @@ Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -765,7 +758,6 @@ sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -778,14 +770,12 @@ sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( } OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "Libhyphen Hyphenator" ); } void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -812,7 +802,6 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) } void SAL_CALL Hyphenator::dispose() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -831,7 +820,6 @@ void SAL_CALL Hyphenator::dispose() } void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -840,7 +828,6 @@ void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& r } void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -850,19 +837,16 @@ void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener > // Service specific part OUString SAL_CALL Hyphenator::getImplementationName() - throw(RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx index a8d680a91400..94f6db85011d 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx @@ -88,33 +88,33 @@ public: virtual ~Hyphenator() override; // XSupportedLocales (for XHyphenator) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual Sequence< Locale > SAL_CALL getLocales() override; + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override; // XHyphenator - virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) override; + virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override; // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index b2b283e2b171..23aeb4f62177 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -88,22 +88,22 @@ public: LangGuess_Impl& operator=(const LangGuess_Impl&) = delete; // XServiceInfo implementation - 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; static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); // XLanguageGuessing implementation - virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) override; + virtual void SAL_CALL disableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) override; + virtual void SAL_CALL enableLanguages( const css::uno::Sequence< css::lang::Locale >& aLanguages ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLanguages( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getEnabledLanguages( ) override; + virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDisabledLanguages( ) override; // implementation specific /// @throws RuntimeException - void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException); + void SetFingerPrintsDB( const OUString &fileName ); }; LangGuess_Impl::LangGuess_Impl() : @@ -167,7 +167,6 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( const OUString& rText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -191,7 +190,6 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( void LangGuess_Impl::SetFingerPrintsDB( const OUString &filePath ) - throw (RuntimeException) { //! text encoding for file name / path needs to be in the same encoding the OS uses OString path = OUStringToOString( filePath, osl_getThreadTextEncoding() ); @@ -203,7 +201,6 @@ void LangGuess_Impl::SetFingerPrintsDB( } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -226,7 +223,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -249,7 +245,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) - throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -273,7 +268,6 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) void SAL_CALL LangGuess_Impl::disableLanguages( const uno::Sequence< Locale >& rLanguages ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -298,7 +292,6 @@ void SAL_CALL LangGuess_Impl::disableLanguages( void SAL_CALL LangGuess_Impl::enableLanguages( const uno::Sequence< Locale >& rLanguages ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -322,19 +315,16 @@ void SAL_CALL LangGuess_Impl::enableLanguages( } OUString SAL_CALL LangGuess_Impl::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString( IMPLNAME ); } sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx index ceb370d85394..58b28fd0a4fb 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx @@ -89,32 +89,32 @@ public: virtual ~MacSpellChecker() override; // XSupportedLocales (for XSpellChecker) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException) override; - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException) override; + virtual Sequence< Locale > SAL_CALL getLocales() override; + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override; // XSpellChecker - virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) override; - virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException) override; + virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override; + virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override; // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) override; - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException) override; + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException) override; + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException) override; + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 7378beb15c55..e17240146d78 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -93,7 +93,6 @@ PropertyHelper_Spell & MacSpellChecker::GetPropHelper_Impl() Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -187,7 +186,6 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales() sal_Bool SAL_CALL MacSpellChecker::hasLocale(const Locale& rLocale) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -272,7 +270,6 @@ sal_Int16 MacSpellChecker::GetSpellFailure( const OUString &rWord, const Locale sal_Bool SAL_CALL MacSpellChecker::isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -381,7 +378,6 @@ Reference< XSpellAlternatives > Reference< XSpellAlternatives > SAL_CALL MacSpellChecker::spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -402,7 +398,6 @@ Reference< XSpellAlternatives > SAL_CALL /// @throws Exception Reference< XInterface > SAL_CALL MacSpellChecker_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new MacSpellChecker); @@ -413,7 +408,6 @@ Reference< XInterface > SAL_CALL MacSpellChecker_CreateInstance( sal_Bool SAL_CALL MacSpellChecker::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -429,7 +423,6 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL MacSpellChecker::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -445,7 +438,6 @@ sal_Bool SAL_CALL OUString SAL_CALL MacSpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "Mac OS X Spell Checker" ); @@ -454,7 +446,6 @@ OUString SAL_CALL void SAL_CALL MacSpellChecker::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -484,7 +475,6 @@ void SAL_CALL void SAL_CALL MacSpellChecker::dispose() - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -499,7 +489,6 @@ void SAL_CALL void SAL_CALL MacSpellChecker::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -510,7 +499,6 @@ void SAL_CALL void SAL_CALL MacSpellChecker::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -520,19 +508,16 @@ void SAL_CALL // Service specific part OUString SAL_CALL MacSpellChecker::getImplementationName() - throw(RuntimeException) { return getImplementationName_Static(); } sal_Bool SAL_CALL MacSpellChecker::supportsService( const OUString& ServiceName ) - throw(RuntimeException) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL MacSpellChecker::getSupportedServiceNames() - throw(RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index d93b093bb465..bb370e144c93 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -112,7 +112,6 @@ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL SpellChecker::getLocales() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -256,7 +255,6 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() } sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -409,7 +407,6 @@ sal_Int16 SpellChecker::GetSpellFailure(const OUString &rWord, const Locale &rLo sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -535,7 +532,6 @@ Reference< XSpellAlternatives > Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -556,7 +552,6 @@ Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( /// @throws Exception Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new SpellChecker); @@ -565,7 +560,6 @@ Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -579,7 +573,6 @@ sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener( sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -592,13 +585,11 @@ sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener( } OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException, std::exception) { return OUString( "Hunspell SpellChecker" ); } void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -625,7 +616,6 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments ) } void SAL_CALL SpellChecker::dispose() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -644,7 +634,6 @@ void SAL_CALL SpellChecker::dispose() } void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -653,7 +642,6 @@ void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& } void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -663,19 +651,16 @@ void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener // Service specific part OUString SAL_CALL SpellChecker::getImplementationName() - throw(RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index 50f9578bf3d4..a1320bc6f597 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -82,32 +82,32 @@ public: virtual ~SpellChecker() override; // XSupportedLocales (for XSpellChecker) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual Sequence< Locale > SAL_CALL getLocales() override; + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override; // XSpellChecker - virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override; - virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override; + virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) override; // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx index f4e2f36f20a3..7e23f023c4e5 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -51,14 +51,12 @@ Meaning::~Meaning() } OUString SAL_CALL Meaning::getMeaning() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aTerm; } Sequence< OUString > SAL_CALL Meaning::querySynonyms() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aSyn; diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index b544754da273..8e6cb7561a94 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -45,8 +45,8 @@ public: virtual ~Meaning() override; // XMeaning - virtual OUString SAL_CALL getMeaning() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getMeaning() override; + virtual css::uno::Sequence< OUString > SAL_CALL querySynonyms() override; // non-interface specific functions void SetSynonyms( const css::uno::Sequence< OUString > &rSyn ); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index e5f342b78111..ea6aca5481ac 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -125,7 +125,6 @@ PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL Thesaurus::getLocales() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -251,7 +250,6 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() } sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -274,7 +272,6 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale, const PropertyValues& rProperties) - throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -514,20 +511,17 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM /// @throws Exception Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Thesaurus); return xService; } OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException, std::exception) { return OUString( "Mythes Thesaurus" ); } void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -583,7 +577,6 @@ OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) } void SAL_CALL Thesaurus::dispose() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -602,7 +595,6 @@ void SAL_CALL Thesaurus::dispose() } void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -611,7 +603,6 @@ void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rx } void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -621,19 +612,16 @@ void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& // Service specific part OUString SAL_CALL Thesaurus::getImplementationName() - throw(RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index 8073aa58f1dc..1fc520e781e9 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -95,27 +95,27 @@ public: virtual ~Thesaurus() override; // XSupportedLocales (for XThesaurus) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual Sequence< Locale > SAL_CALL getLocales() override; + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override; // XThesaurus - virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception) override; + virtual Sequence< Reference < css::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) override; // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static inline OUString getImplementationName_Static() throw(); |