From b63609ba5478ed9b020c113f5704f7ea8447dec8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 21 Sep 2017 15:42:49 +0200 Subject: loplugin:flatten in framework..package Change-Id: Ide8a97eae6e2fdc7d2dcccba1480ac55a9b555bc Reviewed-on: https://gerrit.libreoffice.org/42593 Tested-by: Jenkins Reviewed-by: Noel Grandin --- lingucomponent/source/languageguessing/guesslang.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'lingucomponent/source') diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx index 85e041813205..a6469ec4063a 100644 --- a/lingucomponent/source/languageguessing/guesslang.cxx +++ b/lingucomponent/source/languageguessing/guesslang.cxx @@ -173,17 +173,14 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage( EnsureInitialized(); - lang::Locale aRes; - if (nStartPos >=0 && nLen >= 0 && nStartPos + nLen <= rText.getLength()) - { - OString o( OUStringToOString( rText.copy(nStartPos, nLen), RTL_TEXTENCODING_UTF8 ) ); - Guess g = m_aGuesser.GuessPrimaryLanguage(o.getStr()); - aRes.Language = OUString::createFromAscii( g.GetLanguage().c_str() ); - aRes.Country = OUString::createFromAscii( g.GetCountry().c_str() ); - } - else + if (nStartPos < 0 || nLen < 0 || nStartPos + nLen > rText.getLength()) throw lang::IllegalArgumentException(); + OString o( OUStringToOString( rText.copy(nStartPos, nLen), RTL_TEXTENCODING_UTF8 ) ); + Guess g = m_aGuesser.GuessPrimaryLanguage(o.getStr()); + lang::Locale aRes; + aRes.Language = OUString::createFromAscii( g.GetLanguage().c_str() ); + aRes.Country = OUString::createFromAscii( g.GetCountry().c_str() ); return aRes; } -- cgit v1.2.3