diff options
| author | Eike Rathke <erack@redhat.com> | 2016-08-30 20:45:36 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-31 08:34:41 +0000 |
| commit | 8eec33146af3bd4ffaf9b3a1fb9d2c72f19b6fb3 (patch) | |
| tree | 50c41631ab5828cf9dc8471cbc5ad56eaf56085b | |
| parent | f6c109dc0d5ceee29143de038b230732f78e8ee6 (diff) | |
Related: tdf#83376 fallback to known in linguistic context is wrong, always.
Change-Id: I2f06818e6569fd7e59b94d11b69808a2b81490d5
(cherry picked from commit 9a2d6e7e77a660560af9d5b1bbe3a5171176f8d6)
Reviewed-on: https://gerrit.libreoffice.org/28507
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | linguistic/source/convdicxml.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/dicimp.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/gciterator.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 747401e449f6..4b9510214066 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -212,7 +212,7 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( OUString aValue = rxAttrList->getValueByIndex(i); if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "lang" ) - nLanguage = LanguageTag::convertToLanguageTypeWithFallback( aValue ); + nLanguage = LanguageTag::convertToLanguageType( aValue ); else if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "conversion-type" ) nConversionType = GetConversionTypeFromText( aValue ); } diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 80e424d8cefc..7a21b9c736ad 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -122,7 +122,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg ) if (aTagValue == "<none>") nLng = LANGUAGE_NONE; else - nLng = LanguageTag::convertToLanguageTypeWithFallback( + nLng = LanguageTag::convertToLanguageType( OStringToOUString( aTagValue, RTL_TEXTENCODING_ASCII_US)); } diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 3133cd78a9fb..cc5d2f8d74b6 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1042,7 +1042,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() { // only the first entry is used, there should be only one grammar checker per language const OUString aImplName( aImplNames[0] ); - const LanguageType nLang = LanguageTag::convertToLanguageTypeWithFallback( pElementNames[i] ); + const LanguageType nLang = LanguageTag::convertToLanguageType( pElementNames[i] ); aTmpGCImplNamesByLang[ nLang ] = aImplName; } } |