summaryrefslogtreecommitdiff
path: root/lingucomponent/source/thesaurus
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /lingucomponent/source/thesaurus
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (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/thesaurus')
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.cxx2
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesdta.hxx4
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx12
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.hxx22
4 files changed, 13 insertions, 27 deletions
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();