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/txtnode | |
| 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/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 7aec18cf412f..3db14e6487de 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include <i18npool/mslangid.hxx> #include <vcl/outdev.hxx> #include <vcl/print.hxx> #include <vcl/lineinfo.hxx> @@ -1093,7 +1094,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) if ( ( SW_CJK == nActual || SW_LATIN == nActual ) && nSpaceAdd ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang) + if (MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -1269,7 +1270,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -1480,7 +1481,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -2050,7 +2051,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang ) + if (MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) |