[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - linguistic/source

[Eike Rathke]

 linguistic/source/convdicxml.cxx |    2 +-
 linguistic/source/dicimp.cxx     |    2 +-
 linguistic/source/gciterator.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8eec33146af3bd4ffaf9b3a1fb9d2c72f19b6fb3
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 30 20:45:36 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 747401e..4b95102 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 80e424d..7a21b9c 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 3133cd7..cc5d2f8 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;
                 }
             }