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 /linguistic/source/convdiclist.cxx | |
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 'linguistic/source/convdiclist.cxx')
-rw-r--r-- | linguistic/source/convdiclist.cxx | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 7bc413ca7559..3aecf316ec40 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -88,20 +88,20 @@ public: ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete; // 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; // 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; // 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; // 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; // looks for conversion dictionaries with the specified extension // in the directory and adds them to the container @@ -167,21 +167,18 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName( } uno::Type SAL_CALL ConvDicNameContainer::getElementType( ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return uno::Type( cppu::UnoType<XConversionDictionary>::get()); } sal_Bool SAL_CALL ConvDicNameContainer::hasElements( ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return !aConvDics.empty(); } uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); uno::Reference< XConversionDictionary > xRes( GetByName( rName ) ); @@ -191,7 +188,6 @@ uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) } uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -204,7 +200,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) } sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return GetByName( rName ).is(); @@ -213,7 +208,6 @@ sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) void SAL_CALL ConvDicNameContainer::replaceByName( const OUString& rName, const uno::Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -230,7 +224,6 @@ void SAL_CALL ConvDicNameContainer::replaceByName( void SAL_CALL ConvDicNameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -245,7 +238,6 @@ void SAL_CALL ConvDicNameContainer::insertByName( } void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -405,7 +397,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer() return *mxNameContainer; } -uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( ) throw (RuntimeException, std::exception) +uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( ) { MutexGuard aGuard( GetLinguMutex() ); GetNameContainer(); @@ -417,7 +409,6 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( const OUString& rName, const Locale& rLocale, sal_Int16 nConvDicType ) - throw (NoSupportException, ElementExistException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -457,7 +448,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( sal_Int16 nConversionDictionaryType, ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) - throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -496,7 +486,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( const Locale& rLocale, sal_Int16 nConversionDictionaryType, ConversionDirection eDirection ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -519,7 +508,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( } void SAL_CALL ConvDicList::dispose( ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing) @@ -534,7 +522,6 @@ void SAL_CALL ConvDicList::dispose( ) void SAL_CALL ConvDicList::addEventListener( const uno::Reference< XEventListener >& rxListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing && rxListener.is()) @@ -543,7 +530,6 @@ void SAL_CALL ConvDicList::addEventListener( void SAL_CALL ConvDicList::removeEventListener( const uno::Reference< XEventListener >& rxListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing && rxListener.is()) @@ -551,19 +537,16 @@ void SAL_CALL ConvDicList::removeEventListener( } OUString SAL_CALL ConvDicList::getImplementationName() - throw (RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -578,7 +561,6 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() /// @throws css::uno::Exception uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { return StaticConvDicList::get(); } |