diff options
-rw-r--r-- | i18nlangtag/source/isolang/isolang.cxx | 2 | ||||
-rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 10 | ||||
-rw-r--r-- | i18nutil/source/utility/scripttypedetector.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/convdiclist.cxx | 3 | ||||
-rw-r--r-- | linguistic/source/dlistimp.cxx | 5 | ||||
-rw-r--r-- | sax/source/tools/converter.cxx | 2 | ||||
-rw-r--r-- | sax/source/tools/fshelper.cxx | 2 |
8 files changed, 13 insertions, 15 deletions
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 157598d5cfde..e1c331bf761b 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -778,7 +778,7 @@ OUString IsoLanguageScriptCountryEntry::getTagString() const bool IsoLanguageScriptCountryEntry::startsInIgnoreAsciiCase( const OUString & rStr ) const { - return rStr.matchIgnoreAsciiCaseAsciiL( maLanguageScript, strlen( maLanguageScript), 0); + return rStr.matchIgnoreAsciiCaseAsciiL( maLanguageScript, strlen( maLanguageScript) ); } OUString Bcp47CountryEntry::getTagString() const diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 906c7b3cc94a..34eaeb8bb2f9 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -1327,7 +1327,7 @@ void LanguageTagImpl::convertLocaleToBcp47() } else { - maBcp47 = LanguageTag::convertToBcp47( maLocale, true); + maBcp47 = LanguageTag::convertToBcp47( maLocale ); } mbInitializedBcp47 = true; } @@ -2022,7 +2022,7 @@ LanguageTag & LanguageTag::makeFallback() { if (!mbIsFallback) { - const lang::Locale& rLocale1 = getLocale( true); + const lang::Locale& rLocale1 = getLocale(); lang::Locale aLocale2( MsLangId::Conversion::lookupFallbackLocale( rLocale1)); if ( rLocale1.Language != aLocale2.Language || rLocale1.Country != aLocale2.Country || @@ -2629,7 +2629,7 @@ OUString LanguageTag::convertToBcp47( const com::sun::star::lang::Locale& rLocal if (rLocale.Language.isEmpty()) { if (bResolveSystem) - aBcp47 = LanguageTag::convertToBcp47( LANGUAGE_SYSTEM, true); + aBcp47 = LanguageTag::convertToBcp47( LANGUAGE_SYSTEM ); // else aBcp47 stays empty } else @@ -2680,14 +2680,14 @@ LanguageType LanguageTag::convertToLanguageType( const OUString& rBcp47, bool bR // static LanguageType LanguageTag::convertToLanguageTypeWithFallback( const OUString& rBcp47 ) { - return LanguageTag( rBcp47).makeFallback().getLanguageType( true); + return LanguageTag( rBcp47).makeFallback().getLanguageType(); } // static com::sun::star::lang::Locale LanguageTag::convertToLocaleWithFallback( const OUString& rBcp47 ) { - return LanguageTag( rBcp47).makeFallback().getLocale( true); + return LanguageTag( rBcp47).makeFallback().getLocale(); } diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx index 1a9e2c20df0f..83826e308c6e 100644 --- a/i18nutil/source/utility/scripttypedetector.cxx +++ b/i18nutil/source/utility/scripttypedetector.cxx @@ -91,7 +91,7 @@ sal_Int16 ScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, CTLScriptType::CTL_UNKNOWN } // 88 }; - return unicode::getUnicodeScriptType(Text[nPos], typeList, CTLScriptType::CTL_UNKNOWN); + return unicode::getUnicodeScriptType(Text[nPos], typeList); } // Begin of Script Type is inclusive. diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 18dac9b0055e..9a60c3a9232a 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -521,7 +521,7 @@ bool getJavaProps(const OUString & exePath, if (sLine.isEmpty()) continue; //The JREProperties class writes key value pairs, separated by '=' - sal_Int32 index = sLine.indexOf('=', 0); + sal_Int32 index = sLine.indexOf('='); OSL_ASSERT(index != -1); OUString sKey = sLine.copy(0, index); OUString sVal = sLine.copy(index + 1); diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index c5d8487f7d21..380703b61bfe 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -329,8 +329,7 @@ void ConvDicNameContainer::AddConvDics( // get decoded dictionary file name INetURLObject aURLObj( aURL ); OUString aDicName = aURLObj.getBase( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET, - RTL_TEXTENCODING_UTF8 ); + true, INetURLObject::DECODE_WITH_CHARSET ); uno::Reference < XConversionDictionary > xDic; if (nLang == LANGUAGE_KOREAN && diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 5a4f46570b54..38bbf39443fe 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -353,8 +353,7 @@ void DicList::SearchForDictionaries( // get decoded dictionary file name INetURLObject aURLObj( aURL ); OUString aDicName = aURLObj.getName( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET, - RTL_TEXTENCODING_UTF8 ); + true, INetURLObject::DECODE_WITH_CHARSET ); DictionaryType eType = bNeg ? DictionaryType_NEGATIVE : DictionaryType_POSITIVE; uno::Reference< XDictionary > xDic = @@ -555,7 +554,7 @@ uno::Reference< XDictionary > SAL_CALL osl::MutexGuard aGuard( GetLinguMutex() ); sal_Int16 nLanguage = LinguLocaleToLanguage( rLocale ); - bool bIsWriteablePath = rURL.match( GetDictionaryWriteablePath(), 0 ); + bool bIsWriteablePath = rURL.match( GetDictionaryWriteablePath() ); return new DictionaryNeo( rName, nLanguage, eDicType, rURL, bIsWriteablePath ); } diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 835ba489a6c6..d7adda18df2b 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1236,7 +1236,7 @@ void Converter::convertDate( { const util::DateTime dt(0, 0, 0, 0, i_rDate.Day, i_rDate.Month, i_rDate.Year, false); - convertDateTime(i_rBuffer, dt, pTimeZoneOffset, false); + convertDateTime(i_rBuffer, dt, pTimeZoneOffset); } static void convertTime( diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx index 75a6fa052d32..1ba11cc40811 100644 --- a/sax/source/tools/fshelper.cxx +++ b/sax/source/tools/fshelper.cxx @@ -101,7 +101,7 @@ void FastSerializerHelper::singleElement(sal_Int32 elementTokenId, XFastAttribut FastSerializerHelper* FastSerializerHelper::write(const char* value) { - mpSerializer->write(value, -1, false); + mpSerializer->write(value, -1); return this; } |