diff options
Diffstat (limited to 'i18npool/source')
53 files changed, 347 insertions, 512 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 33ac5864a79c..3a8da9abe49a 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -48,7 +48,6 @@ BreakIteratorImpl::~BreakIteratorImpl() sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_Int32 nStartPos, const Locale &rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) - throw(RuntimeException, std::exception) { if (nCount < 0) throw RuntimeException(); @@ -57,7 +56,6 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos, const Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) - throw(RuntimeException, std::exception) { if (nCount < 0) throw RuntimeException(); @@ -96,7 +94,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len, } Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 nStartPos, - const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception) + const Locale& rLocale, sal_Int16 rWordType ) { sal_Int32 len = Text.getLength(); if( nStartPos < 0 || len == 0 ) @@ -126,7 +124,7 @@ static inline bool SAL_CALL isCJK( const Locale& rLocale ) { } Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int32 nStartPos, - const Locale& rLocale, sal_Int16 rWordType) throw(RuntimeException, std::exception) + const Locale& rLocale, sal_Int16 rWordType) { sal_Int32 len = Text.getLength(); if( nStartPos <= 0 || len == 0 ) { @@ -152,7 +150,7 @@ Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_Int32 nPos, const Locale& rLocale, - sal_Int16 rWordType, sal_Bool bDirection ) throw(RuntimeException, std::exception) + sal_Int16 rWordType, sal_Bool bDirection ) { sal_Int32 len = Text.getLength(); if( nPos < 0 || len == 0 ) @@ -185,7 +183,7 @@ Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_ } sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int32 nPos, - const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception) + const Locale& rLocale, sal_Int16 rWordType ) { sal_Int32 len = Text.getLength(); @@ -201,7 +199,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int3 } sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 nPos, - const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception) + const Locale& rLocale, sal_Int16 rWordType ) { sal_Int32 len = Text.getLength(); @@ -217,7 +215,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 } sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal_Int32 nStartPos, - const Locale &rLocale ) throw(RuntimeException, std::exception) + const Locale &rLocale ) { if (nStartPos < 0 || nStartPos > Text.getLength()) return -1; @@ -226,7 +224,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal } sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_Int32 nStartPos, - const Locale &rLocale ) throw(RuntimeException, std::exception) + const Locale &rLocale ) { if (nStartPos < 0 || nStartPos > Text.getLength()) return -1; @@ -236,13 +234,12 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_I LineBreakResults SAL_CALL BreakIteratorImpl::getLineBreak( const OUString& Text, sal_Int32 nStartPos, const Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, - const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception) + const LineBreakUserOptions& bOptions ) { return LBI->getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions); } sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException, std::exception) { return (nPos < 0 || nPos >= Text.getLength()) ? ScriptType::WEAK : getScriptClass(Text.iterateCodePoints(&nPos, 0)); @@ -277,7 +274,7 @@ static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nSt sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text, - sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception) + sal_Int32 nStartPos, sal_Int16 ScriptType ) { if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1; @@ -295,7 +292,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text, } sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text, - sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception) + sal_Int32 nStartPos, sal_Int16 ScriptType ) { if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1; @@ -314,7 +311,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text, } sal_Int32 SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text, - sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception) + sal_Int32 nStartPos, sal_Int16 ScriptType ) { if (nStartPos < 0) return -1; @@ -335,7 +332,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text, } sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(RuntimeException, std::exception) + sal_Int16 ScriptType ) { if (nStartPos < 0) @@ -357,7 +354,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int3 } sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos, - const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception) + const Locale& /*rLocale*/, sal_Int16 CharType ) { if (CharType == CharType::ANY_CHAR) return 0; if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1; @@ -369,7 +366,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sa } sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_Int32 nStartPos, - const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception) + const Locale& /*rLocale*/, sal_Int16 CharType ) { sal_Int32 strLen = Text.getLength(); @@ -383,7 +380,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_ } sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_Int32 nStartPos, - const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception) + const Locale& /*rLocale*/, sal_Int16 CharType ) { if (CharType == CharType::ANY_CHAR) return -1; if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1; @@ -400,7 +397,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_I } sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, sal_Int32 nStartPos, - const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception) + const Locale& /*rLocale*/, sal_Int16 CharType ) { if(CharType == CharType::ANY_CHAR) return -1; if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1; @@ -421,7 +418,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, s sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/, - sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) + sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) { return 0; } @@ -523,7 +520,7 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) return nRet; } -bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException ) +bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) { // to share service between same Language but different Country code, like zh_CN and zh_TW for (lookupTableItem* listItem : lookupTable) { @@ -547,7 +544,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin } Reference < XBreakIterator > SAL_CALL -BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (RuntimeException) +BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) { if (xBI.is() && rLocale == aLocale) return xBI; @@ -593,19 +590,19 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw ( } OUString SAL_CALL -BreakIteratorImpl::getImplementationName() throw( RuntimeException, std::exception ) +BreakIteratorImpl::getImplementationName() { return OUString("com.sun.star.i18n.BreakIterator"); } sal_Bool SAL_CALL -BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +BreakIteratorImpl::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -BreakIteratorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +BreakIteratorImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.BreakIterator" }; return aRet; diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx index 167b942e040e..5921a8774738 100644 --- a/i18npool/source/breakiterator/breakiterator_cjk.cxx +++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx @@ -39,7 +39,7 @@ BreakIterator_CJK::BreakIterator_CJK() Boundary SAL_CALL BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos, - const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception) + const lang::Locale& nLocale, sal_Int16 wordType) { if (m_xDict) { result = m_xDict->previousWord(text, anyPos, wordType); @@ -56,7 +56,7 @@ BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos, Boundary SAL_CALL BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos, - const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception) + const lang::Locale& nLocale, sal_Int16 wordType) { if (m_xDict) { result = m_xDict->nextWord(text, anyPos, wordType); @@ -74,7 +74,6 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos, Boundary SAL_CALL BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos, const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection ) - throw(RuntimeException, std::exception) { if (m_xDict) { result = m_xDict->getWordBoundary(text, anyPos, wordType, bDirection); @@ -90,7 +89,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak( const OUString& Text, sal_Int32 nStartPos, const lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/, const LineBreakHyphenationOptions& /*hOptions*/, - const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception) + const LineBreakUserOptions& bOptions ) { LineBreakResults lbr; diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx index 02bc5c77f115..f641bc927ca1 100644 --- a/i18npool/source/breakiterator/breakiterator_ctl.cxx +++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx @@ -53,7 +53,6 @@ BreakIterator_CTL::~BreakIterator_CTL() sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text, sal_Int32 nStartPos, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) - throw(RuntimeException, std::exception) { if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { nDone = 0; @@ -80,7 +79,6 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text, sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text, sal_Int32 nStartPos, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone) - throw(RuntimeException, std::exception) { sal_Int32 len = Text.getLength(); if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { @@ -107,7 +105,6 @@ sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text, // This method should be overwritten by derived language specific class. void SAL_CALL BreakIterator_CTL::makeIndex(const OUString& /*text*/, sal_Int32 /*pos*/) - throw(RuntimeException) { throw RuntimeException(); } @@ -117,7 +114,7 @@ LineBreakResults SAL_CALL BreakIterator_CTL::getLineBreak( const OUString& Text, sal_Int32 nStartPos, const lang::Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, - const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception) + const LineBreakUserOptions& bOptions ) { LineBreakResults lbr = BreakIterator_Unicode::getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions ); diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index 7c6f0eb3f374..b658dbdde0e1 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -105,7 +105,6 @@ static sal_Int32 SAL_CALL getACell(const sal_Unicode *text, sal_Int32 pos, sal_I #define is_Thai(c) (0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32 const nStartPos) - throw(RuntimeException) { if (Text != cachedText) { cachedText = Text; diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 8c19096a0acd..35af12103962 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -79,7 +79,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator // loading ICU breakiterator on demand. void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, - sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) throw(uno::RuntimeException) + sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) { bool bNewBreak = false; UErrorCode status = U_ZERO_ERROR; @@ -217,7 +217,6 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text, sal_Int32 nStartPos, const lang::Locale &rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) - throw(uno::RuntimeException, std::exception) { if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text); @@ -236,7 +235,6 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text, sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Text, sal_Int32 nStartPos, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone ) - throw(uno::RuntimeException, std::exception) { if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text); @@ -254,7 +252,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int32 nStartPos, - const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException, std::exception) + const lang::Locale& rLocale, sal_Int16 rWordType ) { loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text); @@ -277,7 +275,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_Int32 nStartPos, - const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException, std::exception) + const lang::Locale& rLocale, sal_Int16 rWordType) { loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text); @@ -300,7 +298,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 nPos, const lang::Locale& rLocale, - sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException, std::exception) + sal_Int16 rWordType, sal_Bool bDirection ) { loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text); sal_Int32 len = Text.getLength(); @@ -334,7 +332,7 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, sal_Int32 nStartPos, - const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception) + const lang::Locale &rLocale ) { loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text); @@ -353,7 +351,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, } sal_Int32 SAL_CALL BreakIterator_Unicode::endOfSentence( const OUString& Text, sal_Int32 nStartPos, - const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception) + const lang::Locale &rLocale ) { loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text); @@ -372,7 +370,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( const OUString& Text, sal_Int32 nStartPos, const lang::Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, - const LineBreakUserOptions& /*rOptions*/ ) throw(uno::RuntimeException, std::exception) + const LineBreakUserOptions& /*rOptions*/ ) { LineBreakResults lbr; @@ -456,19 +454,19 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( } OUString SAL_CALL -BreakIterator_Unicode::getImplementationName() throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getImplementationName() { return OUString::createFromAscii(cBreakIterator); } sal_Bool SAL_CALL -BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL -BreakIterator_Unicode::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +BreakIterator_Unicode::getSupportedServiceNames() { uno::Sequence< OUString > aRet { OUString::createFromAscii(cBreakIterator) }; return aRet; diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 89432a433cfa..94b72e2bf70d 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -42,7 +42,7 @@ CalendarImpl::~CalendarImpl() } void SAL_CALL -CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeException, std::exception) +CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) { Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale); for (sal_Int32 i = 0; i < xC.getLength(); i++) { @@ -55,7 +55,7 @@ CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeExceptio } void SAL_CALL -CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) throw (RuntimeException, std::exception) +CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) { Reference < XCalendar4 > xOldCalendar( xCalendar ); // backup sal_Int32 i; @@ -109,7 +109,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr } Calendar2 SAL_CALL -CalendarImpl::getLoadedCalendar2() throw(RuntimeException, std::exception) +CalendarImpl::getLoadedCalendar2() { if (xCalendar.is()) return xCalendar->getLoadedCalendar2(); @@ -118,7 +118,7 @@ CalendarImpl::getLoadedCalendar2() throw(RuntimeException, std::exception) } Calendar SAL_CALL -CalendarImpl::getLoadedCalendar() throw(RuntimeException, std::exception) +CalendarImpl::getLoadedCalendar() { if (xCalendar.is()) return xCalendar->getLoadedCalendar(); @@ -127,7 +127,7 @@ CalendarImpl::getLoadedCalendar() throw(RuntimeException, std::exception) } Sequence< OUString > SAL_CALL -CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception) +CalendarImpl::getAllCalendars( const Locale& rLocale ) { Sequence< Calendar2 > xC = LocaleDataImpl::get()->getAllCalendars2(rLocale); sal_Int32 nLen = xC.getLength(); @@ -138,7 +138,7 @@ CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, s } void SAL_CALL -CalendarImpl::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) +CalendarImpl::setDateTime( double fTimeInDays ) { if (xCalendar.is()) xCalendar->setDateTime( fTimeInDays ); @@ -147,7 +147,7 @@ CalendarImpl::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exc } double SAL_CALL -CalendarImpl::getDateTime() throw(RuntimeException, std::exception) +CalendarImpl::getDateTime() { if (xCalendar.is()) return xCalendar->getDateTime(); @@ -156,7 +156,7 @@ CalendarImpl::getDateTime() throw(RuntimeException, std::exception) } void SAL_CALL -CalendarImpl::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) +CalendarImpl::setLocalDateTime( double fTimeInDays ) { if (xCalendar.is()) xCalendar->setLocalDateTime( fTimeInDays ); @@ -165,7 +165,7 @@ CalendarImpl::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std } double SAL_CALL -CalendarImpl::getLocalDateTime() throw(RuntimeException, std::exception) +CalendarImpl::getLocalDateTime() { if (xCalendar.is()) return xCalendar->getLocalDateTime(); @@ -174,7 +174,7 @@ CalendarImpl::getLocalDateTime() throw(RuntimeException, std::exception) } OUString SAL_CALL -CalendarImpl::getUniqueID() throw(RuntimeException, std::exception) +CalendarImpl::getUniqueID() { if (xCalendar.is()) return xCalendar->getUniqueID(); @@ -183,7 +183,7 @@ CalendarImpl::getUniqueID() throw(RuntimeException, std::exception) } void SAL_CALL -CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception) +CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) { if (xCalendar.is()) xCalendar->setValue( fieldIndex, value ); @@ -192,7 +192,7 @@ CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeExc } sal_Int16 SAL_CALL -CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception) +CalendarImpl::getValue( sal_Int16 fieldIndex ) { if (xCalendar.is()) return xCalendar->getValue( fieldIndex ); @@ -201,7 +201,7 @@ CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exce } void SAL_CALL -CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeException, std::exception) +CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) { if (xCalendar.is()) xCalendar->addValue( fieldIndex, amount); @@ -210,7 +210,7 @@ CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeEx } sal_Int16 SAL_CALL -CalendarImpl::getFirstDayOfWeek() throw(RuntimeException, std::exception) +CalendarImpl::getFirstDayOfWeek() { if (xCalendar.is()) return xCalendar->getFirstDayOfWeek(); @@ -220,7 +220,6 @@ CalendarImpl::getFirstDayOfWeek() throw(RuntimeException, std::exception) void SAL_CALL CalendarImpl::setFirstDayOfWeek( sal_Int16 day ) -throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->setFirstDayOfWeek(day); @@ -229,7 +228,7 @@ throw(RuntimeException, std::exception) } void SAL_CALL -CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception) +CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) { if (xCalendar.is()) xCalendar->setMinimumNumberOfDaysForFirstWeek(days); @@ -238,7 +237,7 @@ CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(Runtime } sal_Int16 SAL_CALL -CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception) +CalendarImpl::getMinimumNumberOfDaysForFirstWeek() { if (xCalendar.is()) return xCalendar->getMinimumNumberOfDaysForFirstWeek(); @@ -248,7 +247,7 @@ CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std:: OUString SAL_CALL -CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) +CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) { if (xCalendar.is()) return xCalendar->getDisplayName( displayIndex, idx, nameType ); @@ -257,7 +256,7 @@ CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 n } sal_Int16 SAL_CALL -CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException, std::exception) +CalendarImpl::getNumberOfMonthsInYear() { if (xCalendar.is()) return xCalendar->getNumberOfMonthsInYear(); @@ -267,7 +266,7 @@ CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException, std::exception) sal_Int16 SAL_CALL -CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException, std::exception) +CalendarImpl::getNumberOfDaysInWeek() { if (xCalendar.is()) return xCalendar->getNumberOfDaysInWeek(); @@ -277,7 +276,7 @@ CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException, std::exception) Sequence< CalendarItem > SAL_CALL -CalendarImpl::getDays() throw(RuntimeException, std::exception) +CalendarImpl::getDays() { if (xCalendar.is()) return xCalendar->getDays(); @@ -287,7 +286,7 @@ CalendarImpl::getDays() throw(RuntimeException, std::exception) Sequence< CalendarItem > SAL_CALL -CalendarImpl::getMonths() throw(RuntimeException, std::exception) +CalendarImpl::getMonths() { if (xCalendar.is()) return xCalendar->getMonths(); @@ -297,7 +296,7 @@ CalendarImpl::getMonths() throw(RuntimeException, std::exception) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getDays2() throw(RuntimeException, std::exception) +CalendarImpl::getDays2() { if (xCalendar.is()) return xCalendar->getDays2(); @@ -307,7 +306,7 @@ CalendarImpl::getDays2() throw(RuntimeException, std::exception) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getMonths2() throw(RuntimeException, std::exception) +CalendarImpl::getMonths2() { if (xCalendar.is()) return xCalendar->getMonths2(); @@ -317,7 +316,7 @@ CalendarImpl::getMonths2() throw(RuntimeException, std::exception) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getGenitiveMonths2() throw(RuntimeException, std::exception) +CalendarImpl::getGenitiveMonths2() { if (xCalendar.is()) return xCalendar->getGenitiveMonths2(); @@ -327,7 +326,7 @@ CalendarImpl::getGenitiveMonths2() throw(RuntimeException, std::exception) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getPartitiveMonths2() throw(RuntimeException, std::exception) +CalendarImpl::getPartitiveMonths2() { if (xCalendar.is()) return xCalendar->getPartitiveMonths2(); @@ -337,7 +336,7 @@ CalendarImpl::getPartitiveMonths2() throw(RuntimeException, std::exception) sal_Bool SAL_CALL -CalendarImpl::isValid() throw(RuntimeException, std::exception) +CalendarImpl::isValid() { if (xCalendar.is()) return xCalendar->isValid(); @@ -347,7 +346,6 @@ CalendarImpl::isValid() throw(RuntimeException, std::exception) OUString SAL_CALL CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDisplayString(nCalendarDisplayCode, nNativeNumberMode); @@ -356,19 +354,19 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ } OUString SAL_CALL -CalendarImpl::getImplementationName() throw( RuntimeException, std::exception ) +CalendarImpl::getImplementationName() { return OUString("com.sun.star.i18n.CalendarImpl"); } sal_Bool SAL_CALL -CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +CalendarImpl::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CalendarImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +CalendarImpl::getSupportedServiceNames() { Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.i18n.LocaleCalendar"; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index d7c6bad1d7be..a95c8676dda5 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -183,7 +183,7 @@ Calendar_hanja::Calendar_hanja() } OUString SAL_CALL -Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) +Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) { if ( displayIndex == CalendarDisplayIndex::AM_PM ) { // Am/Pm string for Korean Hanja calendar will refer to Japanese locale @@ -197,7 +197,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 } void SAL_CALL -Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception) +Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const css::lang::Locale& rLocale ) { // Since this class could be called by service name 'hanja_yoil', we have to // rename uniqueID to get right calendar defined in locale data. @@ -235,7 +235,7 @@ Calendar_buddhist::Calendar_buddhist() : Calendar_gregorian(buddhist_eraArray) } void SAL_CALL -Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Locale& rLocale ) throw(RuntimeException, std::exception) +Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Locale& rLocale ) { // init. fieldValue[] getValue(); @@ -268,25 +268,25 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, const css::lang::Loc css::i18n::Calendar2 SAL_CALL -Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException, std::exception) +Calendar_gregorian::getLoadedCalendar2() { return aCalendar; } css::i18n::Calendar SAL_CALL -Calendar_gregorian::getLoadedCalendar() throw(RuntimeException, std::exception) +Calendar_gregorian::getLoadedCalendar() { return LocaleDataImpl::downcastCalendar( aCalendar); } OUString SAL_CALL -Calendar_gregorian::getUniqueID() throw(RuntimeException, std::exception) +Calendar_gregorian::getUniqueID() { return aCalendar.Name; } void SAL_CALL -Calendar_gregorian::setDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) +Calendar_gregorian::setDateTime( double fTimeInDays ) { // ICU handles dates in milliseconds as double values and uses floor() // to obtain integer values, which may yield a date decremented by one @@ -306,7 +306,7 @@ Calendar_gregorian::setDateTime( double fTimeInDays ) throw(RuntimeException, st } double SAL_CALL -Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception) +Calendar_gregorian::getDateTime() { if (fieldSet) { setValue(); @@ -319,7 +319,7 @@ Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception) } void SAL_CALL -Calendar_gregorian::setLocalDateTime( double fTimeInDays ) throw(RuntimeException, std::exception) +Calendar_gregorian::setLocalDateTime( double fTimeInDays ) { // See setDateTime() for why the rounding. double fM = fTimeInDays * U_MILLIS_PER_DAY; @@ -336,7 +336,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) throw(RuntimeExceptio } double SAL_CALL -Calendar_gregorian::getLocalDateTime() throw(RuntimeException, std::exception) +Calendar_gregorian::getLocalDateTime() { if (fieldSet) { setValue(); @@ -354,7 +354,7 @@ Calendar_gregorian::getLocalDateTime() throw(RuntimeException, std::exception) // map field value from gregorian calendar to other calendar, it can be overwritten by derived class. // By using eraArray, it can take care Japanese and Taiwan ROC calendar. -void Calendar_gregorian::mapFromGregorian() throw(RuntimeException) +void Calendar_gregorian::mapFromGregorian() { if (eraArray) { sal_Int16 e, y, m, d; @@ -382,7 +382,7 @@ void Calendar_gregorian::mapFromGregorian() throw(RuntimeException) #define FIELDS ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR)) // map field value from other calendar to gregorian calendar, it can be overwritten by derived class. // By using eraArray, it can take care Japanese and Taiwan ROC calendar. -void Calendar_gregorian::mapToGregorian() throw(RuntimeException) +void Calendar_gregorian::mapToGregorian() { if (eraArray && (fieldSet & FIELDS)) { sal_Int16 y, e = fieldValue[CalendarFieldIndex::ERA]; @@ -398,7 +398,7 @@ void Calendar_gregorian::mapToGregorian() throw(RuntimeException) } /// @throws RuntimeException -static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(RuntimeException) +static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) { UCalendarDateFields f; @@ -424,7 +424,7 @@ static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(Runtim } void SAL_CALL -Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception) +Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value ) { if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex) throw ERROR; @@ -465,7 +465,7 @@ bool Calendar_gregorian::getDSTOffset( sal_Int32 & o_nOffset ) const CalendarFieldIndex::DST_OFFSET_SECOND_MILLIS); } -void Calendar_gregorian::submitFields() throw(css::uno::RuntimeException) +void Calendar_gregorian::submitFields() { for (sal_Int16 fieldIndex = 0; fieldIndex < FIELD_INDEX_COUNT; fieldIndex++) { @@ -491,7 +491,7 @@ void Calendar_gregorian::submitFields() throw(css::uno::RuntimeException) body->set( fieldNameConverter( CalendarFieldIndex::DST_OFFSET), nDSTOffset); } -void Calendar_gregorian::setValue() throw(RuntimeException) +void Calendar_gregorian::setValue() { // Copy fields before calling submitFields() directly or indirectly below. memcpy(fieldSetValue, fieldValue, sizeof(fieldSetValue)); @@ -517,7 +517,7 @@ void Calendar_gregorian::setValue() throw(RuntimeException) #endif } -void Calendar_gregorian::getValue() throw(RuntimeException) +void Calendar_gregorian::getValue() { DUMP_ICU_CAL_MSG(("%s\n","getValue()")); DUMP_I18N_CAL_MSG(("%s\n","getValue()")); @@ -561,7 +561,7 @@ void Calendar_gregorian::getValue() throw(RuntimeException) } sal_Int16 SAL_CALL -Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception) +Calendar_gregorian::getValue( sal_Int16 fieldIndex ) { if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex) throw ERROR; @@ -575,7 +575,7 @@ Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std } void SAL_CALL -Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(RuntimeException, std::exception) +Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) { // since ZONE and DST could not be add, we don't need to convert value here UErrorCode status; @@ -585,7 +585,7 @@ Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(Runt } sal_Bool SAL_CALL -Calendar_gregorian::isValid() throw(RuntimeException, std::exception) +Calendar_gregorian::isValid() { if (fieldSet) { sal_Int32 tmp = fieldSet; @@ -683,7 +683,7 @@ static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode) } sal_Int16 SAL_CALL -Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException, std::exception) +Calendar_gregorian::getFirstDayOfWeek() { // UCAL_SUNDAY == 1, Weekdays::SUNDAY == 0 => offset -1 // Check for underflow just in case we're called "out of sync". @@ -694,83 +694,82 @@ Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException, std::exception) void SAL_CALL Calendar_gregorian::setFirstDayOfWeek( sal_Int16 day ) -throw(RuntimeException, std::exception) { // Weekdays::SUNDAY == 0, UCAL_SUNDAY == 1 => offset +1 body->setFirstDayOfWeek( static_cast<UCalendarDaysOfWeek>( day + 1)); } void SAL_CALL -Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception) +Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) { aCalendar.MinimumNumberOfDaysForFirstWeek = days; body->setMinimalDaysInFirstWeek( static_cast<uint8_t>( days)); } sal_Int16 SAL_CALL -Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception) +Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek() { return aCalendar.MinimumNumberOfDaysForFirstWeek; } sal_Int16 SAL_CALL -Calendar_gregorian::getNumberOfMonthsInYear() throw(RuntimeException, std::exception) +Calendar_gregorian::getNumberOfMonthsInYear() { return (sal_Int16) aCalendar.Months.getLength(); } sal_Int16 SAL_CALL -Calendar_gregorian::getNumberOfDaysInWeek() throw(RuntimeException, std::exception) +Calendar_gregorian::getNumberOfDaysInWeek() { return (sal_Int16) aCalendar.Days.getLength(); } Sequence< CalendarItem > SAL_CALL -Calendar_gregorian::getDays() throw(RuntimeException, std::exception) +Calendar_gregorian::getDays() { return LocaleDataImpl::downcastCalendarItems( aCalendar.Days); } Sequence< CalendarItem > SAL_CALL -Calendar_gregorian::getMonths() throw(RuntimeException, std::exception) +Calendar_gregorian::getMonths() { return LocaleDataImpl::downcastCalendarItems( aCalendar.Months); } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getDays2() throw(RuntimeException, std::exception) +Calendar_gregorian::getDays2() { return aCalendar.Days; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getMonths2() throw(RuntimeException, std::exception) +Calendar_gregorian::getMonths2() { return aCalendar.Months; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getGenitiveMonths2() throw(RuntimeException, std::exception) +Calendar_gregorian::getGenitiveMonths2() { return aCalendar.GenitiveMonths; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getPartitiveMonths2() throw(RuntimeException, std::exception) +Calendar_gregorian::getPartitiveMonths2() { return aCalendar.PartitiveMonths; } OUString SAL_CALL -Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) +Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) { OUString aStr; @@ -825,14 +824,12 @@ Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_I // Methods in XExtendedCalendar OUString SAL_CALL Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException, std::exception) { return getDisplayStringImpl( nCalendarDisplayCode, nNativeNumberMode, false); } OUString Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) - throw (RuntimeException) { sal_Int16 value = getValue(sal::static_int_cast<sal_Int16>( DisplayCode2FieldIndex(nCalendarDisplayCode) )); OUString aOUStr; @@ -958,7 +955,6 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In // Methods in XExtendedCalendar OUString SAL_CALL Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException, std::exception) { // make year and era in different order for year before and after 0. if ((nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA || @@ -975,19 +971,19 @@ Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 n } OUString SAL_CALL -Calendar_gregorian::getImplementationName() throw( RuntimeException, std::exception ) +Calendar_gregorian::getImplementationName() { return OUString::createFromAscii(cCalendar); } sal_Bool SAL_CALL -Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +Calendar_gregorian::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -Calendar_gregorian::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Calendar_gregorian::getSupportedServiceNames() { Sequence< OUString > aRet { OUString::createFromAscii(cCalendar) }; return aRet; diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx index 1908ac492e11..11046f8e9cbf 100644 --- a/i18npool/source/calendar/calendar_hijri.cxx +++ b/i18npool/source/calendar/calendar_hijri.cxx @@ -64,7 +64,7 @@ Calendar_hijri::Calendar_hijri() #define FIELDS ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH)) // map field value from hijri calendar to gregorian calendar -void Calendar_hijri::mapToGregorian() throw(RuntimeException) +void Calendar_hijri::mapToGregorian() { if (fieldSet & FIELDS) { sal_Int32 day = (sal_Int32)fieldSetValue[CalendarFieldIndex::DAY_OF_MONTH]; @@ -84,7 +84,7 @@ void Calendar_hijri::mapToGregorian() throw(RuntimeException) } // map field value from gregorian calendar to hijri calendar -void Calendar_hijri::mapFromGregorian() throw(RuntimeException) +void Calendar_hijri::mapFromGregorian() { sal_Int32 month, day, year; diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index a060aa9d5bf6..f9130450895e 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -245,7 +245,7 @@ public: }; // map field value from gregorian calendar to other calendar, it can be overwritten by derived class. -void Calendar_jewish::mapFromGregorian() throw(RuntimeException) +void Calendar_jewish::mapFromGregorian() { int y = fieldValue[CalendarFieldIndex::YEAR]; if (fieldValue[CalendarFieldIndex::ERA] == 0) @@ -261,7 +261,7 @@ void Calendar_jewish::mapFromGregorian() throw(RuntimeException) #define FIELDS ((1 << CalendarFieldIndex::ERA) | (1 << CalendarFieldIndex::YEAR) | (1 << CalendarFieldIndex::MONTH) | (1 << CalendarFieldIndex::DAY_OF_MONTH)) // map field value from other calendar to gregorian calendar, it should be implemented. -void Calendar_jewish::mapToGregorian() throw(RuntimeException) +void Calendar_jewish::mapToGregorian() { if (fieldSet & FIELDS) { sal_Int16 y = fieldSetValue[CalendarFieldIndex::YEAR]; @@ -281,7 +281,6 @@ void Calendar_jewish::mapToGregorian() throw(RuntimeException) // Methods in XExtendedCalendar OUString SAL_CALL Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException, std::exception) { nNativeNumberMode = NativeNumberMode::NATNUM2; // make Hebrew number for Jewish calendar diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index a67023f00c2a..a4582897bb9a 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -57,7 +57,7 @@ cclass_Unicode::~cclass_Unicode() { OUString SAL_CALL -cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { +cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) { sal_Int32 len = Text.getLength(); if (nPos >= len) return OUString(); @@ -69,7 +69,7 @@ cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } OUString SAL_CALL -cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { +cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) { sal_Int32 len = Text.getLength(); if (nPos >= len) return OUString(); @@ -81,7 +81,7 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } OUString SAL_CALL -cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { +cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) { try { sal_Int32 len = Text.getLength(); @@ -120,20 +120,20 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } sal_Int16 SAL_CALL -cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { +cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return (sal_Int16) u_charType(Text.iterateCodePoints(&nPos, 0)); } sal_Int16 SAL_CALL -cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { +cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return (sal_Int16) u_charDirection(Text.iterateCodePoints(&nPos, 0)); } sal_Int16 SAL_CALL -cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { +cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; // ICU Unicode script type UBlockCode starts from 1 for Basic Latin, // while OO.o enum UnicideScript starts from 0. @@ -208,14 +208,14 @@ cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 in } sal_Int32 SAL_CALL -cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) { +cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return getCharType(Text, &nPos, 0); } sal_Int32 SAL_CALL -cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) { +cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; sal_Int32 result = 0; @@ -239,7 +239,6 @@ ParseResult SAL_CALL cclass_Unicode::parseAnyToken( const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException, std::exception) { ParseResult r; if ( Text.getLength() <= nPos ) @@ -263,7 +262,6 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken( const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException, std::exception) { ParseResult r; if ( Text.getLength() <= nPos ) @@ -277,17 +275,17 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken( return r; } -OUString SAL_CALL cclass_Unicode::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL cclass_Unicode::getImplementationName() { return OUString("com.sun.star.i18n.CharacterClassification_Unicode"); } -sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification_Unicode" }; return aRet; diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 424f5ca994a6..cb3c4fb047eb 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -44,28 +44,27 @@ CharacterClassificationImpl::~CharacterClassificationImpl() { OUString SAL_CALL CharacterClassificationImpl::toUpper( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) + sal_Int32 nCount, const Locale& rLocale ) { return getLocaleSpecificCharacterClassification(rLocale)->toUpper(Text, nPos, nCount, rLocale); } OUString SAL_CALL CharacterClassificationImpl::toLower( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) + sal_Int32 nCount, const Locale& rLocale ) { return getLocaleSpecificCharacterClassification(rLocale)->toLower(Text, nPos, nCount, rLocale); } OUString SAL_CALL CharacterClassificationImpl::toTitle( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) + sal_Int32 nCount, const Locale& rLocale ) { return getLocaleSpecificCharacterClassification(rLocale)->toTitle(Text, nPos, nCount, rLocale); } sal_Int16 SAL_CALL CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getType(Text, nPos); @@ -74,7 +73,6 @@ CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos ) sal_Int16 SAL_CALL CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getCharacterDirection(Text, nPos); @@ -83,7 +81,6 @@ CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_In sal_Int16 SAL_CALL CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getScript(Text, nPos); @@ -92,14 +89,14 @@ CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos ) sal_Int32 SAL_CALL CharacterClassificationImpl::getCharacterType( const OUString& Text, sal_Int32 nPos, - const Locale& rLocale ) throw(RuntimeException, std::exception) + const Locale& rLocale ) { return getLocaleSpecificCharacterClassification(rLocale)->getCharacterType(Text, nPos, rLocale); } sal_Int32 SAL_CALL CharacterClassificationImpl::getStringType( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) + sal_Int32 nCount, const Locale& rLocale ) { return getLocaleSpecificCharacterClassification(rLocale)->getStringType(Text, nPos, nCount, rLocale); } @@ -108,7 +105,6 @@ ParseResult SAL_CALL CharacterClassificationImpl::parseAnyToken( const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->parseAnyToken(Text, nPos, rLocale, startCharTokenType,userDefinedCharactersStart, @@ -120,7 +116,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, - const OUString& userDefinedCharactersCont ) throw(RuntimeException, std::exception) + const OUString& userDefinedCharactersCont ) { return getLocaleSpecificCharacterClassification(rLocale)->parsePredefinedToken( nTokenType, Text, nPos, rLocale, startCharTokenType, userDefinedCharactersStart, @@ -154,7 +150,6 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi Reference < XCharacterClassification > const & SAL_CALL CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Locale& rLocale) - throw(RuntimeException) { // reuse instance if locale didn't change if (cachedItem && cachedItem->equals(rLocale)) @@ -193,20 +188,18 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca OUString SAL_CALL CharacterClassificationImpl::getImplementationName() - throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CharacterClassification"); } sal_Bool SAL_CALL CharacterClassificationImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CharacterClassificationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +CharacterClassificationImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification" }; return aRet; diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index 48c5138c0a34..78749a18fff3 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -24,58 +24,58 @@ // class UnoScriptTypeDetector sal_Int16 SAL_CALL -UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) { return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection); } // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) { return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction); } sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) { return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction); } sal_Int16 SAL_CALL -UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) { return ScriptTypeDetector::getCTLScriptType(Text, nPos); } // Begin of Script Type is inclusive. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) { return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos); } // End of the Script Type is exclusive, the return value pointing to the begin of next script type sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) +UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) { return ScriptTypeDetector::endOfCTLScriptType(Text, nPos); } OUString SAL_CALL -UnoScriptTypeDetector::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +UnoScriptTypeDetector::getImplementationName() { return OUString("com.sun.star.i18n.ScriptTypeDetector"); } sal_Bool SAL_CALL -UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) +UnoScriptTypeDetector::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > SAL_CALL -UnoScriptTypeDetector::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +UnoScriptTypeDetector::getSupportedServiceNames() { css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.ScriptTypeDetector" }; return aRet; diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index 68315bfb9c81..253404266976 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -40,7 +40,7 @@ ChapterCollator::~ChapterCollator() } sal_Int32 SAL_CALL -ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(RuntimeException, std::exception) +ChapterCollator::compareString( const OUString& s1, const OUString& s2) { return compareSubstring(s1, 0, s1.getLength(), s2, 0, s2.getLength()); } @@ -49,7 +49,7 @@ ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(Ru sal_Int32 SAL_CALL ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) { if( len1 <= 1 || len2 <= 1 || ! cclass.is() ) return CollatorImpl::compareSubstring( str1, off1, len1, str2, off2, len2 ); @@ -76,19 +76,19 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int const sal_Char cChapCollator[] = "com.sun.star.i18n.ChapterCollator"; OUString SAL_CALL -ChapterCollator::getImplementationName() throw( RuntimeException, std::exception ) +ChapterCollator::getImplementationName() { return OUString(cChapCollator); } sal_Bool SAL_CALL -ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +ChapterCollator::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -ChapterCollator::getSupportedServiceNames() throw( RuntimeException, std::exception ) +ChapterCollator::getSupportedServiceNames() { Sequence< OUString > aRet { cChapCollator }; return aRet; diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index 8b4919a68400..245e9ff3771b 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -47,7 +47,7 @@ CollatorImpl::~CollatorImpl() sal_Int32 SAL_CALL CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) { if (cachedItem) return cachedItem->xC->compareSubstring(str1, off1, len1, str2, off2, len2); @@ -61,7 +61,7 @@ CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 } sal_Int32 SAL_CALL -CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) throw(RuntimeException, std::exception) +CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) { if (cachedItem) return cachedItem->xC->compareString(in_str1, in_str2); @@ -71,7 +71,7 @@ CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) t sal_Int32 SAL_CALL -CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException, std::exception) +CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) { const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale); for (sal_Int32 i = 0; i < imp.getLength(); i++) @@ -84,7 +84,6 @@ CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collato sal_Int32 SAL_CALL CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rLocale, sal_Int32 collatorOptions) - throw(RuntimeException, std::exception) { if (! cachedItem || ! cachedItem->equals(rLocale, impl)) loadCachedCollator(rLocale, impl); @@ -99,7 +98,7 @@ CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rL void SAL_CALL CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const lang::Locale& rLocale, - const Sequence< sal_Int32 >& collatorOptions) throw(RuntimeException, std::exception) + const Sequence< sal_Int32 >& collatorOptions) { sal_Int32 options = 0; for (sal_Int32 i = 0; i < collatorOptions.getLength(); i++) @@ -108,7 +107,7 @@ CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const } Sequence< OUString > SAL_CALL -CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) +CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) { nLocale = rLocale; const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale); @@ -127,7 +126,7 @@ CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(Runtim } Sequence< sal_Int32 > SAL_CALL -CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) throw(RuntimeException, std::exception) +CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) { Sequence< OUString > option_str = mxLocaleData->getCollationOptions(nLocale); Sequence< sal_Int32 > option_int(option_str.getLength()); @@ -143,7 +142,6 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) t bool SAL_CALL CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm) - throw(RuntimeException) { for (size_t l = 0; l < lookupTable.size(); l++) { cachedItem = lookupTable[l]; @@ -168,7 +166,6 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic void SAL_CALL CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) - throw(RuntimeException) { for (lookupTableItem* i : lookupTable) { cachedItem = i; @@ -212,19 +209,18 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS } } -OUString SAL_CALL CollatorImpl::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL CollatorImpl::getImplementationName() { return OUString("com.sun.star.i18n.Collator"); } sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +CollatorImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.Collator" }; return aRet; diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index a1022e49473c..dfba7ac57b1e 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -113,13 +113,13 @@ size_t get_collator_data_zh_zhuyin_length(); sal_Int32 SAL_CALL Collator_Unicode::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) { return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2); // UChar != sal_Unicode in MinGW } sal_Int32 SAL_CALL -Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException, std::exception) +Collator_Unicode::compareString( const OUString& str1, const OUString& str2) { return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr())); // UChar != sal_Unicode in MinGW } @@ -132,7 +132,6 @@ extern "C" { static void SAL_CALL thisModule() {} } sal_Int32 SAL_CALL Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 options) - throw(RuntimeException, std::exception) { if (!collator) { UErrorCode status = U_ZERO_ERROR; @@ -389,19 +388,19 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: OUString SAL_CALL -Collator_Unicode::getImplementationName() throw( RuntimeException, std::exception ) +Collator_Unicode::getImplementationName() { return OUString::createFromAscii(implementationName); } sal_Bool SAL_CALL -Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +Collator_Unicode::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -Collator_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Collator_Unicode::getSupportedServiceNames() { Sequence< OUString > aRet { OUString::createFromAscii(implementationName) }; return aRet; diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 208358cba71b..7a42587bf6c3 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -276,13 +276,13 @@ DefaultNumberingProvider::~DefaultNumberingProvider() } Sequence< Reference<container::XIndexAccess> > -DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException, std::exception) +DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) { return LocaleDataImpl::get()->getOutlineNumberingLevels( rLocale ); } Sequence< Sequence<beans::PropertyValue> > -DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) throw(RuntimeException, std::exception) +DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) { return LocaleDataImpl::get()->getContinuousNumberingLevels( rLocale ); } @@ -394,7 +394,6 @@ void lcl_formatChars3( const sal_Unicode table_capital[], const sal_Unicode tabl */ static void lcl_formatPersianWord( sal_Int32 nNumber, OUString& rsResult ) - throw( IllegalArgumentException, RuntimeException ) { OUStringBuffer aTemp(64); static const sal_Unicode asPersianWord_conjunction_data[] = {0x20,0x0648,0x20,0}; @@ -546,7 +545,6 @@ Any getPropertyByName( const Sequence<beans::PropertyValue>& aProperties, OUString DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyValue>& aProperties, const Locale& aLocale ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { // the Sequence of PropertyValues is expected to have at least 4 elements: // elt Name Type purpose @@ -952,7 +950,6 @@ static const Supported_NumberingType aSupportedTypes[] = static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType); OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) - throw(RuntimeException, std::exception) { if (index < 0 || index >= nSupported_NumberingTypes) throw RuntimeException(); @@ -977,7 +974,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) } bool SAL_CALL -DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(RuntimeException) +DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) { if (! xHierarchicalNameAccess.is()) { Reference< XMultiServiceFactory > xConfigProvider = @@ -1011,7 +1008,6 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti } Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) - throw(RuntimeException, std::exception) { Sequence< sal_Int16 > aRet(nSupported_NumberingTypes ); sal_Int16* pArray = aRet.getArray(); @@ -1029,7 +1025,6 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) } sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier ) - throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(rNumberingIdentifier.equals(makeNumberingIdentifier(i))) @@ -1038,7 +1033,6 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering } sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier ) - throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(rNumberingIdentifier.equals(makeNumberingIdentifier(i))) @@ -1047,7 +1041,6 @@ sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingI } OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingType ) - throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(nNumberingType == aSupportedTypes[i].nType) @@ -1056,19 +1049,16 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT } OUString DefaultNumberingProvider::getImplementationName() - throw( RuntimeException, std::exception ) { return OUString("com.sun.star.text.DefaultNumberingProvider"); } sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { Sequence< OUString > aRet { "com.sun.star.text.DefaultNumberingProvider" }; return aRet; 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; diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 110c73000487..a6594c381b65 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -77,7 +77,7 @@ sal_uInt16** get_zh_zhuyin(sal_Int16*); OUString SAL_CALL IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, - const Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception) + const Locale& rLocale, const OUString& rAlgorithm ) { sal_Int32 i=0; sal_uInt32 ch = rIndexEntry.iterateCodePoints(&i, 0); @@ -135,7 +135,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, OUString SAL_CALL IndexEntrySupplier_asian::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const Locale& rLocale) throw (RuntimeException, std::exception) + const OUString& rPhoneticEntry, const Locale& rLocale) { return getIndexCharacter(getEntry(rIndexEntry, rPhoneticEntry, rLocale), rLocale, aAlgorithm); } @@ -144,7 +144,6 @@ sal_Int16 SAL_CALL IndexEntrySupplier_asian::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 ) - throw (RuntimeException, std::exception) { sal_Int32 result = collator->compareString(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1), getEntry(rIndexEntry2, rPhoneticEntry2, rLocale2)); @@ -160,7 +159,7 @@ IndexEntrySupplier_asian::compareIndexEntry( OUString SAL_CALL IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, - const Locale& rLocale ) throw (RuntimeException, std::exception) + const Locale& rLocale ) { sal_uInt16 **(*func)(sal_Int16*)=nullptr; #ifndef DISABLE_DYNLOADING diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index ee5d0d1b08c8..77135523966a 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -38,29 +38,29 @@ IndexEntrySupplier_Common::~IndexEntrySupplier_Common() { } -Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList() throw (RuntimeException, std::exception) +Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList() { throw RuntimeException(); } -Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& ) throw (RuntimeException, std::exception) +Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& ) { throw RuntimeException(); } OUString SAL_CALL IndexEntrySupplier_Common::getPhoneticCandidate( const OUString&, - const lang::Locale& ) throw (RuntimeException, std::exception) + const lang::Locale& ) { return OUString(); } -sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& ) { throw RuntimeException(); } sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& rLocale, - const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) + const OUString& rAlgorithm, sal_Int32 collatorOptions ) { usePhonetic = LocaleDataImpl::get()->isPhonetic(rLocale, rAlgorithm); collator->loadCollatorAlgorithm(rAlgorithm, rLocale, collatorOptions); @@ -70,7 +70,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& } OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndexEntry, - const OUString&, const lang::Locale& ) throw (RuntimeException, std::exception) + const OUString&, const lang::Locale& ) { sal_Int32 nPos=0; sal_uInt32 indexChar=rIndexEntry.iterateCodePoints(&nPos, 0); @@ -80,7 +80,6 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndex sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry( const OUString& rIndexEntry1, const OUString&, const lang::Locale&, const OUString& rIndexEntry2, const OUString&, const lang::Locale& ) - throw (RuntimeException, std::exception) { return sal::static_int_cast< sal_Int16 >( collator->compareString(rIndexEntry1, rIndexEntry2)); @@ -88,20 +87,20 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry( } OUString SAL_CALL IndexEntrySupplier_Common::getIndexCharacter( const OUString& rIndexEntry, - const lang::Locale& rLocale, const OUString& ) throw (RuntimeException, std::exception) + const lang::Locale& rLocale, const OUString& ) { return getIndexKey(rIndexEntry, rIndexEntry, rLocale); } OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool, - const lang::Locale& ) throw (RuntimeException, std::exception) + const lang::Locale& ) { throw RuntimeException(); } const OUString& SAL_CALL IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry, - const OUString& PhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException) + const OUString& PhoneticEntry, const lang::Locale& rLocale ) { // The condition for using phonetic entry is: // usePhonetic is set for the algorithm; @@ -116,19 +115,19 @@ IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry, } OUString SAL_CALL -IndexEntrySupplier_Common::getImplementationName() throw( RuntimeException, std::exception ) +IndexEntrySupplier_Common::getImplementationName() { return OUString::createFromAscii( implementationName ); } sal_Bool SAL_CALL -IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -IndexEntrySupplier_Common::getSupportedServiceNames() throw( RuntimeException, std::exception ) +IndexEntrySupplier_Common::getSupportedServiceNames() { Sequence< OUString > aRet { OUString::createFromAscii( implementationName ) }; return aRet; diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 8762e9e6c65d..8db03e04afef 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -40,14 +40,14 @@ IndexEntrySupplier_Unicode::~IndexEntrySupplier_Unicode() } sal_Bool SAL_CALL IndexEntrySupplier_Unicode::loadAlgorithm( const lang::Locale& rLocale, - const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) + const OUString& rAlgorithm, sal_Int32 collatorOptions ) { index->init(rLocale, rAlgorithm); return IndexEntrySupplier_Common::loadAlgorithm(rLocale, rAlgorithm, collatorOptions); } OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException, std::exception) + const OUString& rPhoneticEntry, const lang::Locale& rLocale ) { return index->getIndexDescription(getEntry(rIndexEntry, rPhoneticEntry, rLocale)); } @@ -55,7 +55,6 @@ OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rInde sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const lang::Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const lang::Locale& rLocale2 ) - throw (RuntimeException, std::exception) { sal_Int16 result = index->getIndexWeight(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1)) - @@ -68,7 +67,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry( } OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexCharacter( const OUString& rIndexEntry, - const lang::Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception) { + const lang::Locale& rLocale, const OUString& rAlgorithm ) { if (loadAlgorithm( rLocale, rAlgorithm, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)) return index->getIndexDescription(rIndexEntry); @@ -163,7 +162,7 @@ OUString Index::getIndexDescription(const OUString& rIndexEntry) #define LOCALE_EN lang::Locale(OUString("en"), OUString(), OUString()) -void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) throw (RuntimeException, std::exception) +void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm) { OUString keyStr = LocaleDataImpl::get()->getIndexKeysByAlgorithm(rLocale, algorithm); @@ -249,7 +248,7 @@ void Index::makeIndexKeys(const lang::Locale &rLocale, const OUString &algorithm } } -void Index::init(const lang::Locale &rLocale, const OUString& algorithm) throw (RuntimeException, std::exception) +void Index::init(const lang::Locale &rLocale, const OUString& algorithm) { makeIndexKeys(rLocale, algorithm); diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index d7ccf35857fe..d9f6893ab6e0 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -27,7 +27,6 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry, const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) - throw (css::uno::RuntimeException, std::exception) { sal_Unicode ch=rIndexEntry.toChar(); sal_uInt16 first = idx[ ch >> 8 ]; @@ -42,7 +41,6 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const lang::Locale& rLocale ) - throw (css::uno::RuntimeException, std::exception) { return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString()); } @@ -50,7 +48,6 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& I sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 ) - throw (css::uno::RuntimeException, std::exception) { sal_Int16 result = sal::static_int_cast<sal_Int16>( collator->compareString( IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1), @@ -66,13 +63,13 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( static const sal_Char first[] = "ja_phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 collatorOptions ) { return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 collatorOptions ) { return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) == 0; } @@ -80,13 +77,13 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant static const sal_Char last[] = "ja_phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 collatorOptions ) { return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant::loadAlgorithm( const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 collatorOptions ) { return collator->loadCollatorAlgorithm(last, rLocale, collatorOptions) == 0; } diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 69c8525985af..e3b72cd51413 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -51,7 +51,7 @@ InputSequenceCheckerImpl::~InputSequenceCheckerImpl() sal_Bool SAL_CALL InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception) + sal_Unicode inputChar, sal_Int16 inputCheckMode) { if (inputCheckMode == InputSequenceCheckMode::PASSTHROUGH) return true; @@ -66,7 +66,7 @@ InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nSt sal_Int32 SAL_CALL InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception) + sal_Unicode inputChar, sal_Int16 inputCheckMode) { if (inputCheckMode != InputSequenceCheckMode::PASSTHROUGH) { sal_Char* language = getLanguageByScripType(Text[nStartPos], inputChar); @@ -105,7 +105,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode } Reference< XExtendedInputSequenceChecker >& SAL_CALL -InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (RuntimeException) +InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) { if (cachedItem && cachedItem->aLanguage == rLanguage) { return cachedItem->xISC; @@ -134,19 +134,19 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru } OUString SAL_CALL -InputSequenceCheckerImpl::getImplementationName() throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getImplementationName() { return OUString::createFromAscii(serviceName); } sal_Bool SAL_CALL -InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -InputSequenceCheckerImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +InputSequenceCheckerImpl::getSupportedServiceNames() { Sequence< OUString > aRet { OUString::createFromAscii(serviceName) }; return aRet; diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx index c6933bbd1c9c..52f8fae5a9bb 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx @@ -112,7 +112,6 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(css::uno::RuntimeException, std::exception) { sal_Unicode currentChar = Text[nStartPos]; sal_uInt16 ch1 = getCharType(inputChar); @@ -126,7 +125,6 @@ InputSequenceChecker_hi::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(css::uno::RuntimeException, std::exception) { if (checkInputSequence(Text, nStartPos, inputChar, inputCheckMode)) Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar)); diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index e16a16a6b74d..660f78be0998 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -78,7 +78,7 @@ static bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 inputChec sal_Bool SAL_CALL InputSequenceChecker_th::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) + sal_Unicode inputChar, sal_Int16 inputCheckMode) { return check(Text[nStartPos], inputChar, inputCheckMode); } @@ -88,7 +88,6 @@ InputSequenceChecker_th::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(css::uno::RuntimeException, std::exception) { /* 9 rules for input sequence correction, see issue i42661 for detail, diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index f3499f9de386..617ce25267ba 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -384,7 +384,7 @@ LocaleDataImpl::~LocaleDataImpl() LocaleDataItem SAL_CALL -LocaleDataImpl::getLocaleItem( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getLocaleItem( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getLocaleItem" )); @@ -602,7 +602,6 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( Sequence< CalendarItem2 > &LocaleDataImpl::getCalendarItemByName(const OUString& name, const Locale& rLocale, const Sequence< Calendar2 >& calendarsSeq, sal_Int16 item) - throw(RuntimeException, std::exception) { if (!ref_name.equals(name)) { OUString aLocStr, id; @@ -662,7 +661,6 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems( sal_Unicode const * const * const allCalendars, sal_Int16 & rnOffset, const sal_Int16 nWhichItem, const sal_Int16 nCalendar, const Locale & rLocale, const Sequence< Calendar2 > & calendarsSeq ) - throw(RuntimeException, std::exception) { Sequence< CalendarItem2 > aItems; if ( OUString( allCalendars[rnOffset] ) == "ref" ) @@ -707,7 +705,7 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems( } Sequence< Calendar2 > SAL_CALL -LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) { sal_Unicode const * const * allCalendars = nullptr; @@ -753,7 +751,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException Sequence< Calendar > SAL_CALL -LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getAllCalendars( const Locale& rLocale ) { const Sequence< Calendar2 > aCal2( getAllCalendars2( rLocale)); sal_Int32 nLen = aCal2.getLength(); @@ -769,7 +767,7 @@ LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, Sequence< Currency2 > SAL_CALL -LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getAllCurrencies" )); @@ -801,7 +799,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeExceptio Sequence< Currency > SAL_CALL -LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) { Sequence< Currency2 > aCur2( getAllCurrencies2( rLocale)); sal_Int32 nLen = aCur2.getLength(); @@ -817,7 +815,7 @@ LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException Sequence< FormatElement > SAL_CALL -LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getAllFormats( const Locale& rLocale ) { const int SECTIONS = 2; struct FormatSection @@ -868,7 +866,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, s Sequence< OUString > SAL_CALL -LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getDateAcceptancePatterns" )); @@ -897,7 +895,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(Runtime #define COLLATOR_ELEMENTS 3 OUString SAL_CALL -LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException, std::exception) +LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" )); if ( func ) { @@ -912,7 +910,7 @@ LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUStrin Sequence< Implementation > SAL_CALL -LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" )); @@ -934,7 +932,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(Runtim } Sequence< OUString > SAL_CALL -LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getCollationOptions( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollationOptions" )); @@ -954,7 +952,7 @@ LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeExcept } Sequence< OUString > SAL_CALL -LocaleDataImpl::getSearchOptions( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getSearchOptions( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getSearchOptions" )); @@ -984,7 +982,7 @@ LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) } Sequence< OUString > SAL_CALL -LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1003,7 +1001,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) throw(RuntimeExceptio } OUString SAL_CALL -LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1018,7 +1016,7 @@ LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) throw(RuntimeE } bool SAL_CALL -LocaleDataImpl::hasPhonetic( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::hasPhonetic( const Locale& rLocale ) { sal_Int16 indexCount = 0; sal_Unicode **indexArray = getIndexArray(rLocale, indexCount); @@ -1047,28 +1045,28 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& } bool SAL_CALL -LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray && indexArray[4][0]; } OUString SAL_CALL -LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? "0-9"+OUString(indexArray[2]) : OUString(); } OUString SAL_CALL -LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) +LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? OUString(indexArray[1]) : OUString(); } Sequence< UnicodeScript > SAL_CALL -LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getUnicodeScripts" )); @@ -1088,7 +1086,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) throw(RuntimeExceptio } Sequence< OUString > SAL_CALL -LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getFollowPageWords" )); @@ -1108,7 +1106,7 @@ LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeExcepti } Sequence< OUString > SAL_CALL -LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getTransliterations( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getTransliterations" )); @@ -1133,7 +1131,7 @@ LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeExcept LanguageCountryInfo SAL_CALL -LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getLCInfo" )); @@ -1156,7 +1154,7 @@ LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeExc ForbiddenCharacters SAL_CALL -LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" )); @@ -1173,7 +1171,7 @@ LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeExc } OUString SAL_CALL -LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" )); @@ -1187,7 +1185,7 @@ LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) throw(RuntimeExcep } Sequence< OUString > SAL_CALL -LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getBreakIteratorRules" )); @@ -1209,7 +1207,7 @@ LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeExc Sequence< OUString > SAL_CALL -LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getReservedWord( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getReservedWords" )); @@ -1231,7 +1229,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException Sequence< Sequence<beans::PropertyValue> > SAL_CALL -LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) { // load symbol MyFunc_Type2 func = reinterpret_cast<MyFunc_Type2>(getFunctionSymbol( rLocale, "getContinuousNumberingLevels" )); @@ -1329,17 +1327,16 @@ public: OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlineLevels, int nLevels); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override; - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override; //XElementAccess - virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; Sequence< Reference<container::XIndexAccess> > SAL_CALL -LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) +LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) { // load symbol MyFunc_Type3 func = reinterpret_cast<MyFunc_Type3>(getFunctionSymbol( rLocale, "getOutlineNumberingLevels" )); @@ -1411,7 +1408,6 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) throw(R // helper functions oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) - throw(RuntimeException, std::exception) { lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get(); @@ -1459,7 +1455,7 @@ oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLo } Sequence< Locale > SAL_CALL -LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException, std::exception) +LocaleDataImpl::getAllInstalledLocaleNames() { Sequence< lang::Locale > seq( nbOfLocales ); sal_Int16 nInstalled = 0; @@ -1497,13 +1493,12 @@ OutlineNumbering::OutlineNumbering(const OutlineNumberingLevel_Impl* pOutlnLevel { } -sal_Int32 OutlineNumbering::getCount( ) throw(RuntimeException, std::exception) +sal_Int32 OutlineNumbering::getCount( ) { return m_nCount; } Any OutlineNumbering::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if(nIndex < 0 || nIndex >= m_nCount) throw IndexOutOfBoundsException(); @@ -1541,30 +1536,29 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex ) return aRet; } -Type OutlineNumbering::getElementType( ) throw(RuntimeException, std::exception) +Type OutlineNumbering::getElementType( ) { return cppu::UnoType<Sequence<PropertyValue>>::get(); } -sal_Bool OutlineNumbering::hasElements( ) throw(RuntimeException, std::exception) +sal_Bool OutlineNumbering::hasElements( ) { return m_nCount > 0; } OUString SAL_CALL -LocaleDataImpl::getImplementationName() throw( RuntimeException, std::exception ) +LocaleDataImpl::getImplementationName() { return OUString("com.sun.star.i18n.LocaleDataImpl"); } sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +LocaleDataImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.LocaleData" }; return aRet; diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index 26da63a5e69c..fd14c491e934 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -63,8 +63,7 @@ public: {} public: - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override { nBytesToRead = (nBytesToRead > m_seq.getLength() - nPos ) ? m_seq.getLength() - nPos : @@ -75,23 +74,19 @@ public: } virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + sal_Int32 nMaxBytesToRead ) override { return readBytes( aData, nMaxBytesToRead ); } - virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ ) override { // not implemented } - virtual sal_Int32 SAL_CALL available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL available( ) override { return m_seq.getLength() - nPos; } - virtual void SAL_CALL closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) override + virtual void SAL_CALL closeInput( ) override { // not needed } @@ -168,7 +163,7 @@ public: public: // Error handler - virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) override + virtual void SAL_CALL error(const Any& aSAXParseException) override { ++nError; printf( "Error !\n" ); @@ -177,12 +172,12 @@ public: // Error handler Reference < XInterface >() , aSAXParseException ); } - virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override + virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) override { ++nError; printf( "Fatal Error !\n" ); } - virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) override + virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) override { printf( "Warning !\n" ); } @@ -194,7 +189,7 @@ public: // ExtendedDocumentHandler stack<LocaleNode *> currentNode ; LocaleNode * rootNode; - virtual void SAL_CALL startDocument() throw (SAXException, RuntimeException, std::exception) override + virtual void SAL_CALL startDocument() override { printf( "parsing document %s started\n", theLocale); of.writeAsciiString("#include <sal/types.h>\n\n\n"); @@ -202,7 +197,7 @@ public: // ExtendedDocumentHandler of.writeAsciiString("extern \"C\" {\n\n"); } - virtual void SAL_CALL endDocument() throw (SAXException, RuntimeException, std::exception) override + virtual void SAL_CALL endDocument() override { if (rootNode) { @@ -226,8 +221,7 @@ public: // ExtendedDocumentHandler } virtual void SAL_CALL startElement(const OUString& aName, - const Reference< XAttributeList > & xAttribs) - throw (SAXException,RuntimeException, std::exception) override + const Reference< XAttributeList > & xAttribs) override { LocaleNode * l = LocaleNode::createNode (aName, xAttribs); @@ -241,37 +235,35 @@ public: // ExtendedDocumentHandler } - virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL endElement(const OUString& /*aName*/) override { currentNode.pop(); } - virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL characters(const OUString& aChars) override { LocaleNode * l = currentNode.top(); l->setValue (aChars); } - virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) override { } - virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) override { // ignored } - virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/) - throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/) override { // ignored } virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, - const OUString& sSystemId) - throw (RuntimeException, std::exception) override + const OUString& sSystemId) override { InputSource source; source.sSystemId = sSystemId; @@ -283,20 +275,20 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA() throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL startCDATA() override { } - virtual void SAL_CALL endCDATA() throw (RuntimeException, std::exception) override + virtual void SAL_CALL endCDATA() override { } - virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL comment(const OUString& /*sComment*/) override { } - virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) override + virtual void SAL_CALL unknown(const OUString& /*sString*/) override { } - virtual void SAL_CALL allowLineBreak() throw (SAXException, RuntimeException, std::exception ) override + virtual void SAL_CALL allowLineBreak() override { } diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index c1e4c14d9561..01ef7dc3000c 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -63,7 +63,7 @@ OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString); /// @throws RuntimeException OUString SAL_CALL AsciiToNativeChar( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number ) throw(RuntimeException) + Sequence< sal_Int32 >& offset, bool useOffset, sal_Int16 number ) { const sal_Unicode *src = inStr.getStr() + startPos; rtl_uString *newStr = rtl_uString_alloc(nCount); @@ -164,7 +164,7 @@ bool SAL_CALL AsciiToNative_numberMaker(const sal_Unicode *str, sal_Int32 begin, /// @throws RuntimeException OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset, bool useOffset, const Number* number ) throw(RuntimeException) + Sequence< sal_Int32 >& offset, bool useOffset, const Number* number ) { OUString aRet; @@ -301,7 +301,7 @@ static void SAL_CALL NativeToAscii_numberMaker(sal_Int16 max, sal_Int16 prev, co /// @throws RuntimeException static OUString SAL_CALL NativeToAscii(const OUString& inStr, - sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) throw(RuntimeException) + sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset, bool useOffset ) { OUString aRet; @@ -524,7 +524,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) } OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, - sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) throw (RuntimeException) + sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) { if (!isValidNatNum(rLocale, nNativeNumberMode)) return aNumberString; @@ -609,13 +609,13 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr } OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, - sal_Int16 nNativeNumberMode) throw (RuntimeException, std::exception) + sal_Int16 nNativeNumberMode) { Sequence< sal_Int32 > offset; return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); } -sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(css::uno::RuntimeException) +sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) { if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii for (const auto & i : NumberChar) @@ -659,7 +659,7 @@ sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal return inChar; } -sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) { sal_Int16 langnum = getLanguageNumber(rLocale); @@ -687,7 +687,7 @@ sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLoc return false; } -NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) +NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) { static const sal_Int16 attShort = 0; static const sal_Int16 attMedium = 1; @@ -766,7 +766,7 @@ static bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) return false; } -sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) { sal_Unicode numberChar[NumberChar_Count]; for (sal_Int16 i = 0; i < NumberChar_Count; i++) @@ -1035,19 +1035,19 @@ OUString SAL_CALL getCyrillicNativeNumberString(const OUString& aNumberString) static const sal_Char implementationName[] = "com.sun.star.i18n.NativeNumberSupplier"; -OUString SAL_CALL NativeNumberSupplierService::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL NativeNumberSupplierService::getImplementationName() { return OUString(implementationName); } sal_Bool SAL_CALL -NativeNumberSupplierService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +NativeNumberSupplierService::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -NativeNumberSupplierService::getSupportedServiceNames() throw( RuntimeException, std::exception ) +NativeNumberSupplierService::getSupportedServiceNames() { Sequence< OUString > aRet {implementationName}; return aRet; diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 9dab999da366..5fd2af898363 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -36,7 +36,7 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper() css::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) +NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const css::lang::Locale& rLocale ) { OUString elementType = mapElementTypeShortToString(formatType); @@ -64,7 +64,7 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, css::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) +NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale ) { osl::MutexGuard g(maMutex); const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale ); @@ -87,7 +87,7 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::L css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) +NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale ) { osl::MutexGuard g(maMutex); const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale ); @@ -120,7 +120,7 @@ NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) +NumberFormatCodeMapper::getAllFormatCodes( const css::lang::Locale& rLocale ) { osl::MutexGuard g(maMutex); const css::uno::Sequence< css::i18n::FormatElement > &aFormatSeq = getFormats( rLocale ); @@ -246,19 +246,17 @@ NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage OUString SAL_CALL NumberFormatCodeMapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); } sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL -NumberFormatCodeMapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +NumberFormatCodeMapper::getSupportedServiceNames() { css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.NumberFormatMapper" }; return aRet; diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index dbdb1a1542ca..4543bf2004b0 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -67,7 +67,7 @@ namespace * than english ones, ICU 4.2+ has to be used. */ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_Int32 nNumber, - const lang::Locale &rLocale ) throw( RuntimeException, std::exception ) + const lang::Locale &rLocale ) { uno::Sequence< OUString > retValue; @@ -136,17 +136,17 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( sal_I const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; -OUString SAL_CALL OrdinalSuffixService::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL OrdinalSuffixService::getImplementationName() { return OUString(cOrdinalSuffix); } -sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() { Sequence< OUString > aRet { cOrdinalSuffix }; return aRet; 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 <sal_Int32>& 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 diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index a72cdcbfac1e..7421c5dce776 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -71,19 +71,19 @@ TextConversionService::getFunctionBySymbol(const sal_Char* func) #endif OUString SAL_CALL -TextConversionService::getImplementationName() throw( RuntimeException, std::exception ) +TextConversionService::getImplementationName() { return OUString::createFromAscii(implementationName); } sal_Bool SAL_CALL -TextConversionService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +TextConversionService::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TextConversionService::getSupportedServiceNames() throw( RuntimeException, std::exception ) +TextConversionService::getSupportedServiceNames() { Sequence< OUString > aRet { OUString::createFromAscii(implementationName) }; return aRet; diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 2386d44ccb63..0e05fd176b81 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -31,7 +31,6 @@ namespace com { namespace sun { namespace star { namespace i18n { TextConversionResult SAL_CALL TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { getLocaleSpecificTextConversion(rLocale); @@ -44,7 +43,6 @@ TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos, OUString SAL_CALL TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { getLocaleSpecificTextConversion(rLocale); @@ -57,7 +55,6 @@ TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, s OUString SAL_CALL TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence< sal_Int32>& offset) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { getLocaleSpecificTextConversion(rLocale); @@ -69,7 +66,6 @@ TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nS sal_Bool SAL_CALL TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { getLocaleSpecificTextConversion(rLocale); @@ -77,7 +73,7 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex } void SAL_CALL -TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw( NoSupportException ) +TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) { if (rLocale != aLocale) { aLocale = rLocale; @@ -107,20 +103,19 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw } OUString SAL_CALL -TextConversionImpl::getImplementationName() throw( RuntimeException, std::exception ) +TextConversionImpl::getImplementationName() { return OUString("com.sun.star.i18n.TextConversion"); } sal_Bool SAL_CALL TextConversionImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +TextConversionImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.TextConversion" }; return aRet; diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index caef6cc78ffb..0acad9dbe0c9 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -218,7 +218,6 @@ static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, Sequence< TextConversionResult SAL_CALL TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { TextConversionResult result; Sequence <OUString> candidates; @@ -308,7 +307,6 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s OUString SAL_CALL TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { sal_Int32 length = aText.getLength() - nStartPos; @@ -342,7 +340,6 @@ TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sa OUString SAL_CALL TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { offset.realloc(0); return getConversion(aText, nStartPos, nLength, rLocale, nConversionType, nConversionOptions); @@ -350,7 +347,6 @@ TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nSt sal_Bool SAL_CALL TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ ) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { return true; } diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index 0482df603879..39468827b6c8 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -267,7 +267,6 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, TextConversionResult SAL_CALL TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { TextConversionResult result; @@ -282,7 +281,6 @@ TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, s OUString SAL_CALL TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { @@ -304,7 +302,6 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa OUString SAL_CALL TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) { @@ -327,7 +324,6 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt sal_Bool SAL_CALL TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ ) - throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception ) { return false; } diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index 1051576931da..e871c473cd88 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -41,7 +41,6 @@ fullwidthToHalfwidth::fullwidthToHalfwidth() */ OUString SAL_CALL fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -55,7 +54,6 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Unicode SAL_CALL fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) @@ -76,7 +74,6 @@ fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana() */ OUString SAL_CALL fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -90,7 +87,6 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_ sal_Unicode SAL_CALL fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar ) - throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) @@ -111,7 +107,6 @@ fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC() */ OUString SAL_CALL fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -126,7 +121,6 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta sal_Unicode SAL_CALL fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar ) - throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index f422dd387f85..c6aff7aa4870 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -37,7 +37,6 @@ halfwidthToFullwidth::halfwidthToFullwidth() OUString SAL_CALL halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { bool _useOffset = useOffset; // One to One mapping @@ -59,7 +58,6 @@ halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana() OUString SAL_CALL halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { bool _useOffset = useOffset; // One to One mapping @@ -81,7 +79,6 @@ halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS() OUString SAL_CALL halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { bool _useOffset = useOffset; // One to One mapping diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx index 7f611bb007ef..8c83ed8f3ba9 100644 --- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx @@ -31,8 +31,6 @@ ignoreDiacritics_CTL::ignoreDiacritics_CTL() sal_Unicode SAL_CALL ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar) - throw(css::uno::RuntimeException, - css::i18n::MultipleCharsOutputException, std::exception) { if (!m_transliterator) throw css::uno::RuntimeException(); @@ -52,7 +50,6 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unicode nInChar) OUString SAL_CALL ignoreDiacritics_CTL::folding(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset) - throw(css::uno::RuntimeException, std::exception) { if (!m_transliterator) throw css::uno::RuntimeException(); diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 703db166f9be..642466c66185 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -65,7 +65,6 @@ OneToOneMappingTable_t const IandE[] = { OUString SAL_CALL ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 6b01649e6290..08cdc76f1811 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -81,7 +81,6 @@ OneToOneMappingTable_t const ignoreIterationMark_ja_JP_mappingTable[] = { OUString SAL_CALL ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { oneToOneMapping aTable(ignoreIterationMark_ja_JP_mappingTable, sizeof(ignoreIterationMark_ja_JP_mappingTable)); diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index 1e1707c1c6be..f73ebadabb61 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana); return t1->transliterate(inStr, startPos, nCount, offset); @@ -38,7 +37,6 @@ ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount Sequence< OUString > SAL_CALL ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException, std::exception) { rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana); rtl::Reference< katakanaToHiragana > t2(new katakanaToHiragana); @@ -47,7 +45,7 @@ ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 ) } sal_Unicode SAL_CALL -ignoreKana::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +ignoreKana::transliterateChar2Char( sal_Unicode inChar) { rtl::Reference< hiraganaToKatakana > t1(new hiraganaToKatakana); return t1->transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index f03af1054b3d..aae059ed95f9 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -26,7 +26,6 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index a1ee6aaac9bb..11809b98251d 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -288,7 +288,6 @@ static const sal_Unicode table_halfwidth[] = { OUString SAL_CALL ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx index be2f4e84ee52..b463a2ae7c64 100644 --- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP); return t1->transliterate(inStr, startPos, nCount, offset); @@ -37,7 +36,6 @@ ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 Sequence< OUString > SAL_CALL ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException, std::exception) { rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP); rtl::Reference< largeToSmall_ja_JP > t2(new largeToSmall_ja_JP); @@ -46,7 +44,7 @@ ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 } sal_Unicode SAL_CALL -ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar) { rtl::Reference< smallToLarge_ja_JP > t1(new smallToLarge_ja_JP); return t1->transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index 15f6815c2748..813f043f2050 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth); return t1->transliterate(inStr, startPos, nCount, offset); @@ -38,7 +37,6 @@ ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCoun Sequence< OUString > SAL_CALL ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException, std::exception) { rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth); rtl::Reference< halfwidthToFullwidth > t2(new halfwidthToFullwidth); @@ -47,7 +45,7 @@ ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 ) } sal_Unicode SAL_CALL -ignoreWidth::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +ignoreWidth::transliterateChar2Char( sal_Unicode inChar) { rtl::Reference< fullwidthToHalfwidth > t1(new fullwidthToHalfwidth); return t1->transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index d9f80f4a17f1..ee9a1534f4a5 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL TextToPronounce_zh::getType() { return TransliterationType::ONE_TO_ONE| TransliterationType::IGNORE; } @@ -46,7 +46,7 @@ TextToPronounce_zh::getPronounce(const sal_Unicode ch) OUString SAL_CALL TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos, - sal_Int32 nCount, Sequence< sal_Int32 > & offset) throw (RuntimeException, std::exception) + sal_Int32 nCount, Sequence< sal_Int32 > & offset) { OUStringBuffer sb; const sal_Unicode * chArr = inStr.getStr() + startPos; @@ -69,13 +69,13 @@ TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos, } OUString SAL_CALL -TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar) throw(RuntimeException, std::exception) +TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar) { return OUString(getPronounce(inChar)); } sal_Unicode SAL_CALL -TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) { const sal_Unicode* pron=getPronounce(inChar); if (!pron || !pron[0]) @@ -88,7 +88,6 @@ TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeExc sal_Bool SAL_CALL TextToPronounce_zh::equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) - throw (RuntimeException, std::exception) { sal_Int32 realCount; int i; // loop variable diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index f9b58aed7637..0076f957a8e8 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -151,7 +151,7 @@ TransliterationImpl::~TransliterationImpl() // Methods OUString SAL_CALL -TransliterationImpl::getName() throw(RuntimeException, std::exception) +TransliterationImpl::getName() { if (numCascade == 1 && bodyCascade[0].is()) return bodyCascade[0]->getName(); @@ -161,7 +161,7 @@ TransliterationImpl::getName() throw(RuntimeException, std::exception) } sal_Int16 SAL_CALL -TransliterationImpl::getType() throw(RuntimeException, std::exception) +TransliterationImpl::getType() { if (numCascade > 1) return (TransliterationType::CASCADE|TransliterationType::IGNORE); @@ -172,7 +172,6 @@ TransliterationImpl::getType() throw(RuntimeException, std::exception) void SAL_CALL TransliterationImpl::loadModule( TransliterationModules modType, const Locale& rLocale ) - throw(RuntimeException, std::exception) { clear(); if (modType&TransliterationModules_IGNORE_MASK && modType&TransliterationModules_NON_IGNORE_MASK) { @@ -212,7 +211,6 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r void SAL_CALL TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew > & modType, const Locale& rLocale ) - throw(RuntimeException, std::exception) { clear(); sal_Int32 mask = 0, count = modType.getLength(); @@ -237,7 +235,6 @@ TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew > void SAL_CALL TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale& rLocale) - throw(RuntimeException, std::exception) { clear(); if (loadModuleByName(implName, bodyCascade[numCascade], rLocale)) @@ -246,7 +243,7 @@ TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale void SAL_CALL -TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale ) throw(RuntimeException, std::exception) +TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale ) { if (implNameList.getLength() > maxCascade || implNameList.getLength() <= 0) throw ERROR; @@ -259,7 +256,7 @@ TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implName Sequence<OUString> SAL_CALL -TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException, std::exception) +TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) { const Sequence<OUString> &translist = mxLocaledata->getTransliterations(rLocale); Sequence<OUString> r(translist.getLength()); @@ -280,7 +277,7 @@ TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType OUString SAL_CALL TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) + Sequence< sal_Int32 >& offset ) { if (numCascade == 0) return inStr; @@ -342,7 +339,7 @@ TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, s OUString SAL_CALL TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) + Sequence< sal_Int32 >& offset ) { if (numCascade == 0) return inStr; @@ -393,7 +390,7 @@ TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int } OUString SAL_CALL -TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception) +TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) { if (numCascade == 0) return inStr; @@ -409,7 +406,7 @@ TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int3 } OUString SAL_CALL -TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) +TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) { if (numCascade == 0) return OUString(&inChar, 1); @@ -425,7 +422,7 @@ TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(Runtim } sal_Unicode SAL_CALL -TransliterationImpl::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception) +TransliterationImpl::transliterateChar2Char( sal_Unicode inChar ) { sal_Unicode tmpChar = inChar; for (sal_Int32 i = 0; i < numCascade; i++) @@ -438,7 +435,6 @@ sal_Bool SAL_CALL TransliterationImpl::equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(RuntimeException, std::exception) { // since this is an API function make it user fail safe if ( nCount1 < 0 ) { @@ -499,7 +495,7 @@ TransliterationImpl::equals( Sequence< OUString > SAL_CALL TransliterationImpl::getRange(const Sequence< OUString > &inStrs, - const sal_Int32 length, sal_Int16 _numCascade) throw(RuntimeException) + const sal_Int32 length, sal_Int16 _numCascade) { if (_numCascade >= numCascade || ! bodyCascade[_numCascade].is()) return inStrs; @@ -522,7 +518,6 @@ TransliterationImpl::getRange(const Sequence< OUString > &inStrs, Sequence< OUString > SAL_CALL TransliterationImpl::transliterateRange( const OUString& str1, const OUString& str2 ) -throw(RuntimeException, std::exception) { if (numCascade == 1) return bodyCascade[0]->transliterateRange(str1, str2); @@ -539,7 +534,6 @@ sal_Int32 SAL_CALL TransliterationImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) - throw(RuntimeException, std::exception) { if (caseignoreOnly && caseignore.is()) return caseignore->compareSubstring(str1, off1, len1, str2, off2, len2); @@ -564,7 +558,7 @@ TransliterationImpl::compareSubstring( sal_Int32 SAL_CALL -TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) throw (RuntimeException, std::exception) +TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) { if (caseignoreOnly && caseignore.is()) return caseignore->compareString(str1, str2); @@ -596,7 +590,6 @@ namespace } void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTransliteration>& body ) - throw (RuntimeException) { assert(!implName.isEmpty()); ::osl::MutexGuard guard(theTransBodyMutex::get()); @@ -612,7 +605,7 @@ void TransliterationImpl::loadBody( OUString &implName, Reference<XExtendedTrans bool SAL_CALL TransliterationImpl::loadModuleByName( const OUString& implName, - Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException) + Reference<XExtendedTransliteration>& body, const Locale& rLocale) { OUString cname = TRLT_IMPLNAME_PREFIX + implName; loadBody(cname, body); @@ -640,19 +633,19 @@ TransliterationImpl::loadModuleByName( const OUString& implName, } OUString SAL_CALL -TransliterationImpl::getImplementationName() throw( RuntimeException, std::exception ) +TransliterationImpl::getImplementationName() { return OUString("com.sun.star.i18n.Transliteration"); } sal_Bool SAL_CALL -TransliterationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +TransliterationImpl::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TransliterationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +TransliterationImpl::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration" }; return aRet; diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index a0d9ebf8fab1..3d852afb8aea 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -27,7 +27,7 @@ inline sal_Int32 Min( sal_Int32 a, sal_Int32 b ) { return a > b ? b : a; } sal_Bool SAL_CALL transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(RuntimeException, std::exception) + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) { Sequence< sal_Int32 > offset1; Sequence< sal_Int32 > offset2; @@ -59,7 +59,7 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n Sequence< OUString > SAL_CALL -transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 ) throw(RuntimeException, std::exception) +transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 ) { if (str1.isEmpty() || str2.isEmpty()) throw RuntimeException(); @@ -72,7 +72,7 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString sal_Int16 SAL_CALL -transliteration_Ignore::getType() throw(RuntimeException, std::exception) +transliteration_Ignore::getType() { // The type is also defined in com/sun/star/util/TransliterationType.hdl return TransliterationType::IGNORE; @@ -81,7 +81,7 @@ transliteration_Ignore::getType() throw(RuntimeException, std::exception) OUString SAL_CALL transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) + Sequence< sal_Int32 >& offset ) { // The method folding is defined in a sub class. return this->folding( inStr, startPos, nCount, offset); @@ -89,7 +89,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos Sequence< OUString > SAL_CALL transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2, - XTransliteration& t1, XTransliteration& t2 ) throw(RuntimeException) + XTransliteration& t1, XTransliteration& t2 ) { if (str1.isEmpty() || str2.isEmpty()) throw RuntimeException(); @@ -118,7 +118,6 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString OUString SAL_CALL transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. @@ -197,7 +196,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, } sal_Unicode SAL_CALL -transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) { return func ? func( inChar) : table ? (*table)[ inChar ] : inChar; } diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 3ec34f92ed04..1d32fbae7805 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -29,28 +29,25 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL transliteration_Numeric::getType() throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL transliteration_Numeric::getType() { return TransliterationType::NUMERIC; } OUString SAL_CALL transliteration_Numeric::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } sal_Bool SAL_CALL transliteration_Numeric::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -61,7 +58,7 @@ throw(RuntimeException, std::exception) OUString SAL_CALL transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException) + Sequence< sal_Int32 >& offset ) { sal_Int32 number = -1, j = 0, endPos = startPos + nCount; @@ -115,7 +112,7 @@ transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 s OUString SAL_CALL transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) + Sequence< sal_Int32 >& offset ) { if (tableSize) return transliterateBullet( inStr, startPos, nCount, offset); @@ -124,7 +121,7 @@ transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPo } sal_Unicode SAL_CALL -transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(RuntimeException, MultipleCharsOutputException, std::exception) +transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) { if (tableSize) { if (isNumber(inChar)) { diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index b6868a6941ca..978d7cf9cd7a 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -23,7 +23,7 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL transliteration_OneToOne::getType() { // This type is also defined in com/sun/star/util/TransliterationType.hdl return TransliterationType::ONE_TO_ONE; @@ -31,7 +31,7 @@ sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, s OUString SAL_CALL transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, - sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) throw(RuntimeException, std::exception) + sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) { throw RuntimeException(); } @@ -39,14 +39,12 @@ transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startP sal_Bool SAL_CALL transliteration_OneToOne::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ ) - throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ ) - throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -54,7 +52,6 @@ transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OU OUString SAL_CALL transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. @@ -84,7 +81,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP } sal_Unicode SAL_CALL -transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) +transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) { return func ? func( inChar) : (*table)[ inChar ]; } diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index b83539de36d9..8e8fa6bb56b1 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -46,7 +46,7 @@ Transliteration_body::Transliteration_body() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_body"; } -sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL Transliteration_body::getType() { return TransliterationType::ONE_TO_ONE; } @@ -54,14 +54,12 @@ sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException, std:: sal_Bool SAL_CALL Transliteration_body::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/) - throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 ) - throw( RuntimeException, std::exception) { Sequence< OUString > ostr(2); ostr[0] = str1; @@ -95,7 +93,6 @@ OUString SAL_CALL Transliteration_body::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException, std::exception) { const sal_Unicode *in = inStr.getStr() + startPos; @@ -182,7 +179,7 @@ Transliteration_body::transliterate( } OUString SAL_CALL -Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) +Transliteration_body::transliterateChar2String( sal_Unicode inChar ) { const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType); rtl_uString* pStr = rtl_uString_alloc(map.nmap); @@ -197,7 +194,7 @@ Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(Runti } sal_Unicode SAL_CALL -Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception) +Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) { const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType); if (map.nmap > 1) @@ -207,7 +204,7 @@ Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(Multipl OUString SAL_CALL Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset) throw(RuntimeException, std::exception) + Sequence< sal_Int32 >& offset) { return this->transliterate(inStr, startPos, nCount, offset); } @@ -263,7 +260,6 @@ static OUString transliterate_titlecase_Impl( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, const Locale &rLocale, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) { const OUString aText( inStr.copy( startPos, nCount ) ); @@ -311,7 +307,6 @@ static OUString transliterate_titlecase_Impl( OUString SAL_CALL Transliteration_titlecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } @@ -328,7 +323,6 @@ Transliteration_sentencecase::Transliteration_sentencecase() OUString SAL_CALL Transliteration_sentencecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException, std::exception) { return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 77d5a80ea816..e6f0061efc8a 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -40,13 +40,12 @@ Transliteration_caseignore::Transliteration_caseignore() void SAL_CALL Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale ) - throw(RuntimeException, std::exception) { moduleLoaded = (TransliterationModules) (moduleLoaded|modName); aLocale = rLocale; } -sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL Transliteration_caseignore::getType() { // It's NOT TransliterationType::ONE_TO_ONE because it's using casefolding return TransliterationType::IGNORE; @@ -55,7 +54,6 @@ sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException, Sequence< OUString > SAL_CALL Transliteration_caseignore::transliterateRange( const OUString& str1, const OUString& str2 ) - throw( RuntimeException, std::exception) { if (str1.getLength() != 1 || str2.getLength() != 1) throw RuntimeException(); @@ -90,7 +88,6 @@ sal_Bool SAL_CALL Transliteration_caseignore::equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(css::uno::RuntimeException, std::exception) { return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0); } @@ -99,7 +96,6 @@ sal_Int32 SAL_CALL Transliteration_caseignore::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) - throw(RuntimeException, std::exception) { sal_Int32 nMatch1, nMatch2; return compare(str1, off1, len1, nMatch1, str2, off2, len2, nMatch2); @@ -110,7 +106,6 @@ sal_Int32 SAL_CALL Transliteration_caseignore::compareString( const OUString& str1, const OUString& str2) - throw(RuntimeException, std::exception) { sal_Int32 nMatch1, nMatch2; return compare(str1, 0, str1.getLength(), nMatch1, str2, 0, str2.getLength(), nMatch2); @@ -120,7 +115,6 @@ sal_Int32 SAL_CALL Transliteration_caseignore::compare( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(RuntimeException) { const sal_Unicode *unistr1 = const_cast<sal_Unicode*>(str1.getStr()) + pos1; const sal_Unicode *unistr2 = const_cast<sal_Unicode*>(str2.getStr()) + pos2; diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx index e3895d48fa66..987f0f97f54a 100644 --- a/i18npool/source/transliteration/transliteration_commonclass.cxx +++ b/i18npool/source/transliteration/transliteration_commonclass.cxx @@ -33,13 +33,12 @@ transliteration_commonclass::transliteration_commonclass() useOffset = true; } -OUString SAL_CALL transliteration_commonclass::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL transliteration_commonclass::getName() { return OUString::createFromAscii(transliterationName); } void SAL_CALL transliteration_commonclass::loadModule( TransliterationModules /*modName*/, const Locale& rLocale ) -throw(RuntimeException, std::exception) { aLocale = rLocale; } @@ -47,7 +46,6 @@ throw(RuntimeException, std::exception) void SAL_CALL transliteration_commonclass::loadModuleNew( const Sequence < TransliterationModulesNew >& /*modName*/, const Locale& /*rLocale*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -55,21 +53,18 @@ throw(RuntimeException, std::exception) void SAL_CALL transliteration_commonclass::loadModuleByImplName( const OUString& /*implName*/, const Locale& /*rLocale*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } void SAL_CALL transliteration_commonclass::loadModulesByImplNames(const Sequence< OUString >& /*modNamelist*/, const Locale& /*rLocale*/) -throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_commonclass::getAvailableModules( const Locale& /*rLocale*/, sal_Int16 /*sType*/ ) -throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -78,7 +73,6 @@ sal_Int32 SAL_CALL transliteration_commonclass::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) -throw(RuntimeException, std::exception) { Sequence <sal_Int32> offset1(2*len1); Sequence <sal_Int32> offset2(2*len2); @@ -105,13 +99,13 @@ throw(RuntimeException, std::exception) } sal_Int32 SAL_CALL -transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) throw ( RuntimeException, std::exception) +transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) { return( this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength())); } OUString SAL_CALL -transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception) +transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) { Sequence < sal_Int32 > dummy_offset; useOffset = false; @@ -121,22 +115,22 @@ transliteration_commonclass::transliterateString2String( const OUString& inStr, } OUString SAL_CALL -transliteration_commonclass::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) +transliteration_commonclass::transliterateChar2String( sal_Unicode inChar ) { return transliteration_commonclass::transliterateString2String(OUString(&inChar, 1), 0, 1); } -OUString SAL_CALL transliteration_commonclass::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL transliteration_commonclass::getImplementationName() { return OUString::createFromAscii(implementationName); } -sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() { Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration.l10n" }; return aRet; |