diff options
Diffstat (limited to 'i18npool/source/transliteration')
18 files changed, 47 insertions, 102 deletions
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; |