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/source/languageguessing | |
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/source/languageguessing')
-rw-r--r-- | lingucomponent/source/languageguessing/guesslang.cxx | 30 |
1 files changed, 10 insertions, 20 deletions
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(); } |