diff options
author | Eike Rathke <erack@redhat.com> | 2012-11-24 19:51:53 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-11-24 19:53:03 +0100 |
commit | d7a5ec62e91ce3dc5b784815254218f16181f676 (patch) | |
tree | 67994cf02b7089e6533f1c66d26c73850b4ac477 /lingucomponent/source | |
parent | Updated core (diff) | |
download | core-d7a5ec62e91ce3dc5b784815254218f16181f676.tar.gz core-d7a5ec62e91ce3dc5b784815254218f16181f676.zip |
get rid of CreateLocale() and related
Change-Id: Iba035ff20b149b3d85a8c0ea25430892c3e40e3f
Diffstat (limited to 'lingucomponent/source')
3 files changed, 7 insertions, 7 deletions
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 91bdfe42705a..e7fe7a4de971 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -485,13 +485,13 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph < nHyphenationPos) ? nHyphenationPosAltHyph : nHyphenationPos); // dicretionary hyphenation - xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ), nPos, + xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LanguageTag( aLocale ).getLanguageType(), nPos, aWord.replaceAt(nHyphenationPosAlt + 1, cut[nHyphenationPos], repHyph), (sal_Int16) nHyphenationPosAltHyph); } else { - xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LocaleToLanguage( aLocale ), + xRes = HyphenatedWord::CreateHyphenatedWord( aWord, LanguageTag( aLocale ).getLanguageType(), (sal_Int16)nHyphenationPos, aWord, (sal_Int16) nHyphenationPos); } } @@ -542,7 +542,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const //well as "hyphenate" if (aWord.getLength() < minLen) { - return PossibleHyphens::CreatePossibleHyphens( aWord, LocaleToLanguage( aLocale ), + return PossibleHyphens::CreatePossibleHyphens( aWord, LanguageTag( aLocale ).getLanguageType(), aWord, Sequence< sal_Int16 >() ); } @@ -689,7 +689,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear(); Reference< XPossibleHyphens > xRes = PossibleHyphens::CreatePossibleHyphens( - aWord, LocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos); + aWord, LanguageTag( aLocale ).getLanguageType(), hyphenatedWord, aHyphPos); delete[] hyphens; delete[] lcword; diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index c7d3addb2963..160eed154c4f 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -375,7 +375,7 @@ sal_Bool SAL_CALL SpellChecker::isValid( const OUString& rWord, const Locale& rL sal_Int16 nFailure = GetSpellFailure( rWord, rLocale ); if (nFailure != -1 && !rWord.match(A2OU(SPELLML_HEADER), 0)) { - sal_Int16 nLang = LocaleToLanguage( rLocale ); + sal_Int16 nLang = LanguageTag( rLocale ).getLanguageType(); // postprocess result for errors that should be ignored const bool bIgnoreError = (!rHelper.IsSpellUpperCase() && IsUpper( rWord, nLang )) || @@ -418,7 +418,7 @@ Reference< XSpellAlternatives > if (n) { - sal_Int16 nLang = LocaleToLanguage( rLocale ); + sal_Int16 nLang = LanguageTag( rLocale ).getLanguageType(); int numsug = 0; Sequence< OUString > aStr( 0 ); diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 5adc00702cf8..7f17e22255a1 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -308,7 +308,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes sal_Int32 stem = 0; sal_Int32 stem2 = 0; - sal_Int16 nLanguage = LocaleToLanguage( rLocale ); + sal_Int16 nLanguage = LanguageTag( rLocale ).getLanguageType(); if (nLanguage == LANGUAGE_NONE || rTerm.isEmpty()) return noMeanings; |