From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "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 Reviewed-by: Stephan Bergmann --- i18npool/source/search/textsearch.cxx | 19 +++----------- i18npool/source/search/textsearch.hxx | 48 ++++++++++++----------------------- 2 files changed, 19 insertions(+), 48 deletions(-) (limited to 'i18npool/source/search') diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index da2c5a4c35bb..f1e09da1d075 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -130,7 +130,7 @@ TextSearch::~TextSearch() delete pJumpTable2; } -void TextSearch::setOptions2( const SearchOptions2& rOptions ) throw( RuntimeException, std::exception ) +void TextSearch::setOptions2( const SearchOptions2& rOptions ) { aSrchPara = rOptions; @@ -259,7 +259,7 @@ void TextSearch::setOptions2( const SearchOptions2& rOptions ) throw( RuntimeExc } } -void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeException, std::exception ) +void TextSearch::setOptions( const SearchOptions& rOptions ) { sal_Int16 nAlgorithmType2; switch (rOptions.algorithmType) @@ -303,7 +303,6 @@ sal_Int32 FindPosInSeq_Impl( const Sequence & rOff, sal_Int32 nPos ) } bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos) - throw( RuntimeException ) { sal_Int32 nDone; return nPos == xBreak->previousCharacters(searchStr, nPos+1, @@ -311,7 +310,6 @@ bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos) } SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw( RuntimeException, std::exception ) { SearchResult sres; @@ -427,7 +425,6 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta } SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException, std::exception) { SearchResult sres; @@ -678,7 +675,6 @@ sal_Int32 TextSearch::GetDiff( const sal_Unicode cChr ) const SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { SearchResult aRet; aRet.subRegExpressions = 0; @@ -749,7 +745,6 @@ SearchResult TextSearch::NSrchFrwrd( const OUString& searchStr, sal_Int32 startP } SearchResult TextSearch::NSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { SearchResult aRet; aRet.subRegExpressions = 0; @@ -915,7 +910,6 @@ static bool lcl_findRegex( RegexMatcher * pRegexMatcher, sal_Int32 nStartPos, UE SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { SearchResult aRet; aRet.subRegExpressions = 0; @@ -967,7 +961,6 @@ SearchResult TextSearch::RESrchFrwrd( const OUString& searchStr, SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { // NOTE: for backwards search callers provide startPos/endPos inverted! SearchResult aRet; @@ -1040,7 +1033,6 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, // search for words phonetically SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { SearchResult aRet; aRet.subRegExpressions = 0; @@ -1085,7 +1077,6 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr, SearchResult TextSearch::ApproxSrchBkwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) { SearchResult aRet; aRet.subRegExpressions = 0; @@ -1138,7 +1129,6 @@ void setWildcardMatch( css::util::SearchResult& rRes, sal_Int32 nStartOffset, sa } SearchResult TextSearch::WildcardSrchFrwrd( const OUString& searchStr, sal_Int32 nStartPos, sal_Int32 nEndPos ) - throw(RuntimeException) { SearchResult aRes; aRes.subRegExpressions = 0; // no match @@ -1310,7 +1300,6 @@ SearchResult TextSearch::WildcardSrchFrwrd( const OUString& searchStr, sal_Int32 } SearchResult TextSearch::WildcardSrchBkwrd( const OUString& searchStr, sal_Int32 nStartPos, sal_Int32 nEndPos ) - throw(RuntimeException) { SearchResult aRes; aRes.subRegExpressions = 0; // no match @@ -1557,19 +1546,17 @@ static OUString getImplementationName_Static() OUString SAL_CALL TextSearch::getImplementationName() - throw( RuntimeException, std::exception ) { return getImplementationName_Static(); } sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception ) +TextSearch::getSupportedServiceNames() { Sequence< OUString > aRet { getServiceName_Static() }; return aRet; diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index cd8712b18a91..3ddc7cb8de61 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -75,26 +75,22 @@ class TextSearch: public cppu::WeakImplHelper /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL NSrchFrwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL NSrchBkwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); // Members and methods for the regular expression search RegexMatcher* pRegexMatcher; /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL RESrchFrwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL RESrchBkwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); void RESrchPrepare( const css::util::SearchOptions2&); // Members and methods for the "Weight Levenshtein-Distance" search @@ -104,13 +100,11 @@ class TextSearch: public cppu::WeakImplHelper /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL ApproxSrchFrwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL ApproxSrchBkwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); // Members and methods for the wildcard search OUString maWildcardReversePattern; @@ -120,20 +114,17 @@ class TextSearch: public cppu::WeakImplHelper /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL WildcardSrchFrwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); /// @throws css::uno::RuntimeException css::util::SearchResult SAL_CALL WildcardSrchBkwrd( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException); + sal_Int32 startPos, sal_Int32 endPos ); bool IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const; bool checkCTLStart, checkCTLEnd; /// @throws css::uno::RuntimeException - bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos) - throw(css::uno::RuntimeException); + bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos); public: explicit TextSearch( @@ -143,29 +134,22 @@ public: // XTextSearch virtual void SAL_CALL - setOptions( const css::util::SearchOptions& options ) - throw(css::uno::RuntimeException, std::exception) override; + setOptions( const css::util::SearchOptions& options ) override; virtual css::util::SearchResult SAL_CALL searchForward( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 startPos, sal_Int32 endPos ) override; virtual css::util::SearchResult SAL_CALL searchBackward( const OUString& searchStr, - sal_Int32 startPos, sal_Int32 endPos ) - throw(css::uno::RuntimeException, std::exception) override; + sal_Int32 startPos, sal_Int32 endPos ) override; // XTextSearch2 virtual void SAL_CALL - setOptions2( const css::util::SearchOptions2& options ) - throw(css::uno::RuntimeException, std::exception) override; + setOptions2( const css::util::SearchOptions2& options ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; #endif -- cgit