diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-19 13:48:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-19 14:11:50 +0100 |
| commit | d9e4c74811855de15f1bf2045c2c9b061a2d4dc6 (patch) | |
| tree | 895cbcd595094e9fd2621a943fc83bb004b429c9 /sw/source/core/text/portxt.cxx | |
| parent | 2a598619d7fbc992f1903a745fd536ddf5e45c81 (diff) | |
merge together hand-crafted traditional/simplified chinese tests
merge together a gadzillion hand-crafted
isSimpleChinese/isTraditionalChinese/isKoreanVariants/isCJK
implementations which should fix a goodly amount of them
add a MsLangId::isFamilyNameFirst for locales where
family name appears first while I'm at it.
Change-Id: I65377793be037d16fe7250cd7450b28aec689e83
Diffstat (limited to 'sw/source/core/text/portxt.cxx')
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 5bcd3e331a34..6cb66ce90449 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -29,6 +29,7 @@ #include <ctype.h> #include <com/sun/star/i18n/ScriptType.hdl> +#include <i18npool/mslangid.hxx> #include <hintids.hxx> // CH_TXTATR #include <SwPortionHandler.hxx> #include <porlay.hxx> @@ -101,7 +102,7 @@ sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, LanguageType aLang = rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) { const SwLinePortion* pPor = rPor.GetPortion(); if ( pPor && ( pPor->IsKernPortion() || @@ -209,7 +210,7 @@ sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr, LanguageType aLang = rInf.GetTxtFrm()->GetTxtNode()->GetLang( nPos, 1, nNextScript ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) ++nCnt; } } |