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 /i18npool/source/indexentry/indexentrysupplier.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 'i18npool/source/indexentry/indexentrysupplier.cxx')
-rw-r--r-- | i18npool/source/indexentry/indexentrysupplier.cxx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index cb06d7968329..cf6b633414dc 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -32,18 +32,18 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r { } -Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException, std::exception) +Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() { return LocaleDataImpl::get()->getAllInstalledLocaleNames(); } -Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException, std::exception) +Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) { return LocaleDataImpl::get()->getIndexAlgorithm(rLocale); } sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm, - sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) + sal_Int32 collatorOptions ) { Sequence < OUString > algorithmList = getAlgorithmList( rLocale ); for (sal_Int32 i = 0; i < algorithmList.getLength(); i++) { @@ -55,13 +55,13 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons return false; } -sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) { return LocaleDataImpl::get()->hasPhonetic(rLocale); } OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry, - const Locale& rLocale ) throw (RuntimeException, std::exception) + const Locale& rLocale ) { if (getLocaleSpecificIndexEntrySupplier(rLocale, OUString()).is()) return xIES->getPhoneticCandidate(rIndexEntry, rLocale); @@ -70,7 +70,7 @@ OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rInd } OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const Locale& rLocale ) throw (RuntimeException, std::exception) + const OUString& rPhoneticEntry, const Locale& rLocale ) { if (xIES.is()) return xIES->getIndexKey(rIndexEntry, rPhoneticEntry, rLocale); @@ -81,7 +81,6 @@ OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry, sal_Int16 SAL_CALL IndexEntrySupplier::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 ) -throw (css::uno::RuntimeException, std::exception) { if (xIES.is()) return xIES->compareIndexEntry(rIndexEntry1, rPhoneticEntry1, rLocale1, @@ -92,13 +91,12 @@ throw (css::uno::RuntimeException, std::exception) OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexEntry, const Locale& rLocale, const OUString& rSortAlgorithm ) -throw (RuntimeException, std::exception) { return getLocaleSpecificIndexEntrySupplier(rLocale, rSortAlgorithm)-> getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } -bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) +bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) { Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext); @@ -111,7 +109,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O } Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL -IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) throw (RuntimeException) +IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) { if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && rLocale.Country == aLocale.Country && rLocale.Variant == aLocale.Variant) @@ -165,7 +163,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c } OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages, - const Locale& rLocale ) throw (RuntimeException, std::exception) + const Locale& rLocale ) { Sequence< OUString > aFollowPageWords = LocaleDataImpl::get()->getFollowPageWords(rLocale); @@ -177,19 +175,19 @@ OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePage #define implementationName "com.sun.star.i18n.IndexEntrySupplier" OUString SAL_CALL -IndexEntrySupplier::getImplementationName() throw( RuntimeException, std::exception ) +IndexEntrySupplier::getImplementationName() { return OUString( implementationName ); } sal_Bool SAL_CALL -IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +IndexEntrySupplier::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -IndexEntrySupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) +IndexEntrySupplier::getSupportedServiceNames() { Sequence< OUString > aRet { implementationName }; return aRet; |