summaryrefslogtreecommitdiffstats
path: root/editeng/source
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-07-13 02:54:05 +0200
committerEike Rathke <erack@redhat.com>2013-07-13 11:55:16 +0200
commit358d1a99484bcc02900bd200a7606a7bf3298cac (patch)
tree031f808141dbc712553b8a4a029a354a2699a622 /editeng/source
parentadded static convertTo...() methods (diff)
downloadcore-358d1a99484bcc02900bd200a7606a7bf3298cac.tar.gz
core-358d1a99484bcc02900bd200a7606a7bf3298cac.zip
use static LanguageTag::convertTo...() for standalone conversions
If no LanguageTag instance is at hand use the static methods to convert between BCP 47 string, Locale and MS-LangID instead of creating temporary instances. Change-Id: I9597f768078eb81c840e84a5db5617f26bb7dc09
Diffstat (limited to 'editeng/source')
-rw-r--r--editeng/source/editeng/editview.cxx8
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/editeng/impedit4.cxx8
-rw-r--r--editeng/source/items/textitem.cxx2
-rw-r--r--editeng/source/misc/hangulhanja.cxx4
-rw-r--r--editeng/source/misc/splwrap.cxx2
-rw-r--r--editeng/source/misc/svxacorr.cxx2
-rw-r--r--editeng/source/misc/unolingu.cxx6
-rw-r--r--editeng/source/outliner/outlvw.cxx2
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx8
10 files changed, 22 insertions, 22 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index e5f45e70ae40..17d9fb1f1a21 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -129,10 +129,10 @@ LanguageType EditView::CheckLanguage(
// en-US
aLangList[3] = LANGUAGE_ENGLISH_US;
#ifdef DEBUG
- lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() );
- lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() );
- lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() );
- lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() );
+ lang::Locale a0( LanguageTag::convertToLocale( aLangList[0] ) );
+ lang::Locale a1( LanguageTag::convertToLocale( aLangList[1] ) );
+ lang::Locale a2( LanguageTag::convertToLocale( aLangList[2] ) );
+ lang::Locale a3( LanguageTag::convertToLocale( aLangList[3] ) );
#endif
sal_Int32 nCount = sizeof (aLangList) / sizeof (aLangList[0]);
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 9a82eb3dc042..f2579f8c123a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1781,7 +1781,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence< PropertyValue >(), 1 );
i18n::LineBreakUserOptions aUserOptions;
- const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( LanguageTag( aLocale ).getLanguageType(), sal_True );
+ const i18n::ForbiddenCharacters* pForbidden = GetForbiddenCharsTable()->GetForbiddenCharacters( LanguageTag::convertToLanguageType( aLocale ), sal_True );
aUserOptions.forbiddenBeginCharacters = pForbidden->beginLine;
aUserOptions.forbiddenEndCharacters = pForbidden->endLine;
aUserOptions.applyForbiddenRules = ((const SfxBoolItem&)pNode->GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES )).GetValue();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0252b8d78e3e..72b4c83a3e19 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1504,7 +1504,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang )
++nStart;
LanguageType nLangFound = pEditEngine->GetLanguage( k, nStart );
#ifdef DEBUG
- lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
+ lang::Locale aLocale( LanguageTag::convertToLocale( nLangFound ) );
#endif
bHasConvTxt = (nSrcLang == nLangFound) ||
(editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
@@ -1569,8 +1569,8 @@ void ImpEditEngine::Convert( EditView* pEditView,
TextConvWrapper aWrp( Application::GetDefDialogParent(),
::comphelper::getProcessComponentContext(),
- LanguageTag( nSrcLang ).getLocale(),
- LanguageTag( nDestLang ).getLocale(),
+ LanguageTag::convertToLocale( nSrcLang ),
+ LanguageTag::convertToLocale( nDestLang ),
pDestFont,
nOptions, bIsInteractive,
bIsStart, pEditView );
@@ -1696,7 +1696,7 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang,
sal_uInt16 nLangIdx = nEnd > nStart ? nStart + 1 : nStart;
LanguageType nLangFound = pEditEngine->GetLanguage( aCurStart.nPara, nLangIdx );
#ifdef DEBUG
- lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() );
+ lang::Locale aLocale( LanguageTag::convertToLocale( nLangFound ) );
#endif
sal_Bool bLangOk = (nLangFound == nSrcLang) ||
(editeng::HangulHanjaConversion::IsChinese( nLangFound ) &&
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 6c666e35cf7b..2918b22d426c 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -2631,7 +2631,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if(!(rVal >>= aLocale))
return sal_False;
- SetValue( LanguageTag( aLocale ).getLanguageType( false));
+ SetValue( LanguageTag::convertToLanguageType( aLocale, false));
}
break;
}
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 15f9acbf853b..010f21d29341 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -241,8 +241,8 @@ namespace editeng
, m_pUIParent( _pUIParent )
, m_xContext( rxContext )
, m_aSourceLocale( _rSourceLocale )
-, m_nSourceLang( LanguageTag( _rSourceLocale ).getLanguageType() )
-, m_nTargetLang( LanguageTag( _rTargetLocale ).getLanguageType() )
+, m_nSourceLang( LanguageTag::convertToLanguageType( _rSourceLocale ) )
+, m_nTargetLang( LanguageTag::convertToLanguageType( _rTargetLocale ) )
, m_pTargetFont( _pTargetFont )
, m_bIsInteractive( _bIsInteractive )
, m_pAntiImpl( _pAntiImpl )
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 318998405c70..01816b4c7390 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -228,7 +228,7 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang(
if (SVX_LANG_NEED_CHECK == ((nVal >> 8) & 0x00FF))
{
sal_uInt16 nTmpVal = SVX_LANG_MISSING_DO_WARN;
- if (xHyph.is() && xHyph->hasLocale( LanguageTag( nLang ).getLocale() ))
+ if (xHyph.is() && xHyph->hasLocale( LanguageTag::convertToLocale( nLang ) ))
nTmpVal = SVX_LANG_OK;
nVal &= 0x00FF;
nVal |= nTmpVal << 8;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d06b9d204815..d40f481ee606 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1847,7 +1847,7 @@ sal_Bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
OUString SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
sal_Bool bNewFile, sal_Bool bTst ) const
{
- OUString sRet, sExt( LanguageTag( eLang ).getBcp47() );
+ OUString sRet, sExt( LanguageTag::convertToBcp47( eLang ) );
sExt = "_" + sExt + ".dat";
if( bNewFile )
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index a8554d187273..9dced466ec42 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -130,7 +130,7 @@ void ThesDummy_Impl::GetCfgLocales()
Locale *pLocale = pLocaleSeq->getArray();
for (sal_Int32 i = 0; i < nLen; ++i)
{
- pLocale[i] = LanguageTag( pNodeNames[i] ).getLocale();
+ pLocale[i] = LanguageTag::convertToLocale( pNodeNames[i] );
}
}
}
@@ -677,7 +677,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAll()
xChangeAll = uno::Reference< XDictionary > (
_xDicList->createDictionary(
"ChangeAllList",
- LanguageTag( LANGUAGE_NONE ).getLocale(),
+ LanguageTag::convertToLocale( LANGUAGE_NONE ),
DictionaryType_NEGATIVE, String() ), UNO_QUERY );
}
return xChangeAll;
@@ -705,7 +705,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
try
{
xTmp = xTmpDicList->createDictionary( aDicName,
- LanguageTag( LANGUAGE_NONE ).getLocale(),
+ LanguageTag::convertToLocale( LANGUAGE_NONE ),
DictionaryType_POSITIVE,
linguistic::GetWritableDictionaryURL( aDicName ) );
}
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index c1b8fa8bd255..a72f2bc9c30a 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1575,7 +1575,7 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext(
aText = pEditEngine->GetText( aTextSel );
aTextSel.Adjust();
LanguageType nLang = pEditEngine->GetLanguage( aTextSel.nStartPara, aTextSel.nStartPos );
- OUString aLangText( LanguageTag( nLang ).getBcp47() );
+ OUString aLangText( LanguageTag::convertToBcp47( nLang ) );
// set word and locale to look up as status value
OUString aStatusVal= aText + "#" + aLangText;
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 12dcee9be9a0..08d29aa5ab58 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -52,7 +52,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
if(!mxForbiddenChars.is())
throw RuntimeException();
- const LanguageType eLang = LanguageTag( rLocale ).getLanguageType();
+ const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
if(!pForbidden)
throw NoSuchElementException();
@@ -68,7 +68,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
if(!mxForbiddenChars.is())
return sal_False;
- const LanguageType eLang = LanguageTag( rLocale ).getLanguageType();
+ const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
const ForbiddenCharacters* pForbidden = mxForbiddenChars->GetForbiddenCharacters( eLang, sal_False );
return NULL != pForbidden;
@@ -82,7 +82,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co
if(!mxForbiddenChars.is())
throw RuntimeException();
- const LanguageType eLang = LanguageTag( rLocale ).getLanguageType();
+ const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
mxForbiddenChars->SetForbiddenCharacters( eLang, rForbiddenCharacters );
onChange();
@@ -96,7 +96,7 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
if(!mxForbiddenChars.is())
throw RuntimeException();
- const LanguageType eLang = LanguageTag( rLocale ).getLanguageType();
+ const LanguageType eLang = LanguageTag::convertToLanguageType( rLocale );
mxForbiddenChars->ClearForbiddenCharacters( eLang );
onChange();