diff options
Diffstat (limited to 'i18npool/source')
21 files changed, 45 insertions, 45 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 24ca264e708b..1ac3fd64af53 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -527,7 +527,7 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) return nRet; } -bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) +bool 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) { @@ -567,7 +567,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin return false; } -Reference < XBreakIterator > SAL_CALL +Reference < XBreakIterator > BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) { if (xBI.is() && rLocale == aLocale) diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index b4ca111179c1..3ed048b02253 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -77,7 +77,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator }; // loading ICU breakiterator on demand. -void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, +void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) { bool bNewBreak = false; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 522a2cf8a077..4d6d0ff279b3 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -140,7 +140,7 @@ Calendar_gregorian::Calendar_gregorian(const Era *_earArray) { init(_earArray); } -void SAL_CALL +void Calendar_gregorian::init(const Era *_eraArray) { cCalendar = "com.sun.star.i18n.Calendar_gregorian"; diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 849251e65213..8e925653e9ab 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -124,7 +124,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken( contCharTokenType, userDefinedCharactersCont); } -bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) +bool CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) { // to share service between same Language but different Country code, like zh_CN and zh_SG for (size_t l = 0; l < lookupTable.size(); l++) { @@ -149,7 +149,7 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi return false; } -Reference < XCharacterClassification > const & SAL_CALL +Reference < XCharacterClassification > const & CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Locale& rLocale) { // reuse instance if locale didn't change diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index fd9b1f1bb053..1f6de90d125e 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -140,7 +140,7 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) return option_int; } -bool SAL_CALL +bool CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm) { for (size_t l = 0; l < lookupTable.size(); l++) { @@ -164,7 +164,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic return false; } -void SAL_CALL +void CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) { for (lookupTableItem* i : lookupTable) { diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index f898d6fde3e3..861d58f8e7cc 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -975,7 +975,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) } } -bool SAL_CALL +bool DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) { if (! xHierarchicalNameAccess.is()) { diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index d467b5b708b9..7acb0069da32 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -93,7 +93,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } -bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) +bool IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) { Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext); @@ -105,7 +105,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O return false; } -Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL +Reference < css::i18n::XExtendedIndexEntrySupplier > const & IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) { if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index 5bc149041a40..39d68f78c8f7 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -98,7 +98,7 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool, throw RuntimeException(); } -const OUString& SAL_CALL +const OUString& IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry, const OUString& PhoneticEntry, const lang::Locale& rLocale ) { diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 24964521ae1e..155423b5ec1f 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -106,7 +106,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode return nullptr; } -Reference< XExtendedInputSequenceChecker >& SAL_CALL +Reference< XExtendedInputSequenceChecker >& InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage) { if (cachedItem && cachedItem->aLanguage == rLanguage) { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index e84f2b6282e7..64c619466dfa 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -480,7 +480,7 @@ public: lcl_LookupTableHelper(); ~lcl_LookupTableHelper(); - oslGenericFunction SAL_CALL getFunctionSymbolByName( + oslGenericFunction getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction, LocaleDataLookupTableItem** pOutCachedItem ); @@ -514,7 +514,7 @@ lcl_LookupTableHelper::~lcl_LookupTableHelper() maLookupTable.clear(); } -oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( +oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction, LocaleDataLookupTableItem** pOutCachedItem ) { @@ -936,7 +936,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) #define COLLATOR_OFFSET_RULE 2 #define COLLATOR_ELEMENTS 3 -OUString SAL_CALL +OUString LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" )); @@ -1013,7 +1013,7 @@ LocaleDataImpl::getSearchOptions( const Locale& rLocale ) } } -sal_Unicode ** SAL_CALL +sal_Unicode ** LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getIndexAlgorithm" )); @@ -1023,7 +1023,7 @@ LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) return nullptr; } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1042,7 +1042,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) } } -OUString SAL_CALL +OUString LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1057,7 +1057,7 @@ LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) return OUString(); } -bool SAL_CALL +bool LocaleDataImpl::hasPhonetic( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1072,7 +1072,7 @@ LocaleDataImpl::hasPhonetic( const Locale& rLocale ) return false; } -sal_Unicode ** SAL_CALL +sal_Unicode ** LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm) { sal_Int16 indexCount = 0; @@ -1086,28 +1086,28 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& return nullptr; } -bool SAL_CALL +bool LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray && indexArray[4][0]; } -OUString SAL_CALL +OUString 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 +OUString LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? OUString(indexArray[1]) : OUString(); } -Sequence< UnicodeScript > SAL_CALL +Sequence< UnicodeScript > LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getUnicodeScripts" )); @@ -1127,7 +1127,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) } } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getFollowPageWords" )); @@ -1212,7 +1212,7 @@ LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) } } -OUString SAL_CALL +OUString LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" )); @@ -1226,7 +1226,7 @@ LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) return OUString(); } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getBreakIteratorRules" )); @@ -1270,7 +1270,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale ) } -Sequence< Sequence<beans::PropertyValue> > SAL_CALL +Sequence< Sequence<beans::PropertyValue> > LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) { // load symbol @@ -1376,7 +1376,7 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; }; -Sequence< Reference<container::XIndexAccess> > SAL_CALL +Sequence< Reference<container::XIndexAccess> > LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) { // load symbol @@ -1448,7 +1448,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) // helper functions -oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) +oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) { lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get(); diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index d90518063a13..f3b2b6786324 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -523,7 +523,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) return -1; } -OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, +OUString NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) { if (!isValidNatNum(rLocale, nNativeNumberMode)) @@ -615,7 +615,7 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); } -sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) +sal_Unicode NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) { if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii for (const auto & i : NumberChar) diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 3ddc7cb8de61..6f9c3d189cf4 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -124,7 +124,7 @@ class TextSearch: public cppu::WeakImplHelper bool checkCTLStart, checkCTLEnd; /// @throws css::uno::RuntimeException - bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos); + bool isCellStart(const OUString& searchStr, sal_Int32 nPos); public: explicit TextSearch( diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index 002ba056cdb1..fe5ac7eba6be 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -59,7 +59,7 @@ static void* nullFunc() return nullptr; } -oslGenericFunction SAL_CALL +oslGenericFunction TextConversionService::getFunctionBySymbol(const sal_Char* func) { if (hModule) diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 2237fef42820..7a9d02942ca8 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -73,7 +73,7 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex return xTC->interactiveConversion(rLocale, nTextConversionType, nTextConversionOptions); } -void SAL_CALL +void TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) { if (rLocale != aLocale) { diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index 23fabd706df1..64be16109db5 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -120,7 +120,7 @@ const sal_Unicode* getHanja2HangulData(); #endif -Sequence< OUString > SAL_CALL +Sequence< OUString > TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja) { sal_Unicode ch; diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index f9a938137580..e856b225c917 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -77,7 +77,7 @@ const sal_uInt16 *getSTC_WordEntry_S2T(); #endif -OUString SAL_CALL +OUString TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions) { const sal_Unicode *Data; @@ -114,7 +114,7 @@ TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, return OUString(newStr, SAL_NO_ACQUIRE); //take ownership } -OUString SAL_CALL +OUString TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) { sal_Int32 dictLen = 0; diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index be3c1f5815b1..e9322a6adc01 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -35,7 +35,7 @@ sal_Int16 SAL_CALL TextToPronounce_zh::getType() return TransliterationType::ONE_TO_ONE| TransliterationType::IGNORE; } -const sal_Unicode* SAL_CALL +const sal_Unicode* TextToPronounce_zh::getPronounce(const sal_Unicode ch) { static const sal_Unicode emptyString[]={0}; diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 456b8793c1ab..ea3e84075784 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -500,7 +500,7 @@ TransliterationImpl::equals( #define MaxOutput 2 -Sequence< OUString > SAL_CALL +Sequence< OUString > TransliterationImpl::getRange(const Sequence< OUString > &inStrs, const sal_Int32 length, sal_Int16 _numCascade) { @@ -610,7 +610,7 @@ void TransliterationImpl::loadBody( OUString const &implName, Reference<XExtende body = lastTransBody.Body; } -bool SAL_CALL +bool TransliterationImpl::loadModuleByName( const OUString& implName, Reference<XExtendedTransliteration>& body, const Locale& rLocale) { diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 98d245ada181..5d1a92e467c7 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL #define isNumber(c) ((c) >= 0x30 && (c) <= 0x39) #define NUMBER_ZERO 0x30 -OUString SAL_CALL +OUString transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) { diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index baafc85acb17..ea5682daec4f 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -216,7 +216,7 @@ Transliteration_casemapping::Transliteration_casemapping() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_casemapping"; } -void SAL_CALL +void Transliteration_casemapping::setMappingType( const MappingType rMappingType, const Locale& rLocale ) { nMappingType = rMappingType; diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 705734d05626..6242aa7be12d 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -113,7 +113,7 @@ Transliteration_caseignore::compareString( return compare(str1, 0, str1.getLength(), nMatch1, str2, 0, str2.getLength(), nMatch2); } -sal_Int32 SAL_CALL +sal_Int32 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) |