summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-08-30 20:23:02 +0200
committerAndras Timar <andras.timar@collabora.com>2016-09-01 12:13:39 +0200
commite07e27ed1dc9e38dc5faed4aae2d47a5eb462dda (patch)
tree850e880ea026ee7a70cbd19e6d541c3e580bd230
parentc11057005402bf4ce1d9a26abbc63fefeb7225bc (diff)
Resolves: tdf#83376 do not let linguistic tools fall back to known languages
Falling back to known locales was necessary before the new language tag implementation that can register "unknown" tags on the fly. In fact here we want to handle tags unknown to us and not fall back to worst case en-US even, so that dictionaries, grammar checkers, thesauri et al for any language tag can be used with such tagged document content. Change-Id: I06e54f41e00e69779b4c0cbbc891f250545a17d2 (cherry picked from commit 04311182b6fadcbdeef7aec15c7eea0240ee628c) Reviewed-on: https://gerrit.libreoffice.org/28505 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 76538731fb60c8563c5538101bdafe5434b681b8)
-rw-r--r--linguistic/source/lngsvcmgr.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 7a2808e9eb84..e4d324643c5a 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -864,7 +864,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
LanguageType nLang = LANGUAGE_NONE;
if (!aKeyText.isEmpty())
- nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText );
+ nLang = LanguageTag::convertToLanguageType( aKeyText );
GetSpellCheckerDsp_Impl( false ); // don't set service list, it will be done below
pSpellDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames );
@@ -888,7 +888,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
LanguageType nLang = LANGUAGE_NONE;
if (!aKeyText.isEmpty())
- nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText );
+ nLang = LanguageTag::convertToLanguageType( aKeyText );
if (SvtLinguConfig().HasGrammarChecker())
{
@@ -915,7 +915,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
LanguageType nLang = LANGUAGE_NONE;
if (!aKeyText.isEmpty())
- nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText );
+ nLang = LanguageTag::convertToLanguageType( aKeyText );
GetHyphenatorDsp_Impl( false ); // don't set service list, it will be done below
pHyphDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames );
@@ -939,7 +939,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames )
LanguageType nLang = LANGUAGE_NONE;
if (!aKeyText.isEmpty())
- nLang = LanguageTag::convertToLanguageTypeWithFallback( aKeyText );
+ nLang = LanguageTag::convertToLanguageType( aKeyText );
GetThesaurusDsp_Impl( false ); // don't set service list, it will be done below
pThesDsp->SetServiceList( LanguageTag::convertToLocale(nLang), aSvcImplNames );