From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- .../source/hyphenator/hyphen/hyphenimp.cxx | 30 +++++++++--------- .../source/hyphenator/hyphen/hyphenimp.hxx | 30 +++++++++--------- .../source/languageguessing/guesslang.cxx | 36 +++++++++++----------- .../source/spellcheck/spell/sspellimp.cxx | 28 ++++++++--------- .../source/spellcheck/spell/sspellimp.hxx | 28 ++++++++--------- .../source/thesaurus/libnth/nthesdta.cxx | 4 +-- .../source/thesaurus/libnth/nthesdta.hxx | 4 +-- .../source/thesaurus/libnth/nthesimp.cxx | 22 ++++++------- .../source/thesaurus/libnth/nthesimp.hxx | 22 ++++++------- 9 files changed, 102 insertions(+), 102 deletions(-) (limited to 'lingucomponent') diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 0e5000875cf8..b74b2dac65bb 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -102,7 +102,7 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL Hyphenator::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -222,7 +222,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() } sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -247,7 +247,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) - throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException) + throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) { int nHyphenationPos = -1; int nHyphenationPosAlt = -1; @@ -502,7 +502,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::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++) @@ -517,7 +517,7 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { PropertyHelper_Hyphenation& rHelper = GetPropHelper(); rHelper.SetTmpPropVals(aProperties); @@ -736,7 +736,7 @@ Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -750,7 +750,7 @@ sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -763,14 +763,14 @@ sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( } OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "Libhyphen Hyphenator" ); } void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException) + throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -797,7 +797,7 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) } void SAL_CALL Hyphenator::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -816,7 +816,7 @@ void SAL_CALL Hyphenator::dispose() } void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -825,7 +825,7 @@ void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& r } void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -835,7 +835,7 @@ void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener > // Service specific part OUString SAL_CALL Hyphenator::getImplementationName() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -843,13 +843,13 @@ OUString SAL_CALL Hyphenator::getImplementationName() } sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx index d3e3d966d57b..b95c6e800f72 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx @@ -90,33 +90,33 @@ public: virtual ~Hyphenator(); // XSupportedLocales (for XHyphenator) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception); // XHyphenator - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception); // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); 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 361a67aebbd6..0476917b1f58 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -93,18 +93,18 @@ public: explicit LangGuess_Impl(css::uno::Reference< css::uno::XComponentContext > const & rxContext); // XServiceInfo implementation - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); // XLanguageGuessing implementation - virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL disableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enableLanguages( const ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale >& aLanguages ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getEnabledLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDisabledLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // implementation specific void SetFingerPrintsDB( const OUString &fileName ) throw (RuntimeException); @@ -175,7 +175,7 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( const OUString& rText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -211,7 +211,7 @@ void LangGuess_Impl::SetFingerPrintsDB( } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -234,7 +234,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getAvailableLanguages( ) } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -257,7 +257,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getEnabledLanguages( ) } uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -281,7 +281,7 @@ uno::Sequence< Locale > SAL_CALL LangGuess_Impl::getDisabledLanguages( ) void SAL_CALL LangGuess_Impl::disableLanguages( const uno::Sequence< Locale >& rLanguages ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -306,7 +306,7 @@ void SAL_CALL LangGuess_Impl::disableLanguages( void SAL_CALL LangGuess_Impl::enableLanguages( const uno::Sequence< Locale >& rLanguages ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); @@ -330,20 +330,20 @@ void SAL_CALL LangGuess_Impl::enableLanguages( } OUString SAL_CALL LangGuess_Impl::getImplementationName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); return OUString( IMPLNAME ); } sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence SAL_CALL LangGuess_Impl::getSupportedServiceNames( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLangGuessMutex() ); return getSupportedServiceNames_Static(); diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index 9c9faf900e8b..1531c7e4e04d 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -103,7 +103,7 @@ PropertyHelper_Spelling & SpellChecker::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL SpellChecker::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -229,7 +229,7 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() } sal_Bool SAL_CALL SpellChecker::hasLocale(const Locale& rLocale) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -368,7 +368,7 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rL sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -482,7 +482,7 @@ Reference< XSpellAlternatives > Reference< XSpellAlternatives > SAL_CALL SpellChecker::spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -511,7 +511,7 @@ Reference< XInterface > SAL_CALL SpellChecker_CreateInstance( sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -525,7 +525,7 @@ sal_Bool SAL_CALL SpellChecker::addLinguServiceEventListener( sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -538,14 +538,14 @@ sal_Bool SAL_CALL SpellChecker::removeLinguServiceEventListener( } OUString SAL_CALL SpellChecker::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "Hunspell SpellChecker" ); } void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException) + throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -572,7 +572,7 @@ void SAL_CALL SpellChecker::initialize( const Sequence< Any >& rArguments ) } void SAL_CALL SpellChecker::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -591,7 +591,7 @@ void SAL_CALL SpellChecker::dispose() } void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -600,7 +600,7 @@ void SAL_CALL SpellChecker::addEventListener( const Reference< XEventListener >& } void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -610,7 +610,7 @@ void SAL_CALL SpellChecker::removeEventListener( const Reference< XEventListener // Service specific part OUString SAL_CALL SpellChecker::getImplementationName() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -618,13 +618,13 @@ OUString SAL_CALL SpellChecker::getImplementationName() } sal_Bool SAL_CALL SpellChecker::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL SpellChecker::getSupportedServiceNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx b/lingucomponent/source/spellcheck/spell/sspellimp.hxx index a271b3d7d49d..4393a1b96d68 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx @@ -83,32 +83,32 @@ public: virtual ~SpellChecker(); // XSupportedLocales (for XSpellChecker) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception); // XSpellChecker - virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); - virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); + virtual sal_Bool SAL_CALL isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception); + virtual Reference< XSpellAlternatives > SAL_CALL spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception); // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException); + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception); // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); 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 6cc4b911cd25..6f8b937fb7bf 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx @@ -53,14 +53,14 @@ Meaning::~Meaning() } OUString SAL_CALL Meaning::getMeaning() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aTerm; } Sequence< OUString > SAL_CALL Meaning::querySynonyms() - throw(RuntimeException) + 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 ec16610353ef..c748469a2dd1 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -50,8 +50,8 @@ public: virtual ~Meaning(); // XMeaning - virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getMeaning() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL querySynonyms() throw(::com::sun::star::uno::RuntimeException, std::exception); // non-interface specific functions void SetSynonyms( const ::com::sun::star::uno::Sequence< OUString > &rSyn ); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 15b590db013e..b0b99724cf69 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -125,7 +125,7 @@ PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL Thesaurus::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -251,7 +251,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales() } sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -274,7 +274,7 @@ sal_Bool SAL_CALL Thesaurus::hasLocale(const Locale& rLocale) Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryMeanings( const OUString& qTerm, const Locale& rLocale, const PropertyValues& rProperties) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -526,14 +526,14 @@ Reference< XInterface > SAL_CALL Thesaurus_CreateInstance( } OUString SAL_CALL Thesaurus::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "OpenOffice.org New Thesaurus" ); } void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException) + throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -589,7 +589,7 @@ OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) } void SAL_CALL Thesaurus::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -608,7 +608,7 @@ void SAL_CALL Thesaurus::dispose() } void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -617,7 +617,7 @@ void SAL_CALL Thesaurus::addEventListener( const Reference< XEventListener >& rx } void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -627,20 +627,20 @@ void SAL_CALL Thesaurus::removeEventListener( const Reference< XEventListener >& // Service specific part OUString SAL_CALL Thesaurus::getImplementationName() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } sal_Bool SAL_CALL Thesaurus::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL Thesaurus::getSupportedServiceNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx index ecfb4be8b725..e82cfec80972 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx @@ -98,27 +98,27 @@ public: virtual ~Thesaurus(); // XSupportedLocales (for XThesaurus) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException); + virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception); // XThesaurus - virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException); + virtual Sequence< Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) throw(IllegalArgumentException, RuntimeException, std::exception); // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException); + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); static inline OUString getImplementationName_Static() throw(); -- cgit v1.2.3