diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-24 12:26:28 +0000 |
|---|---|---|
| committer | Bosdonnat Cedric <cedric.bosdonnat@free.fr> | 2013-01-25 14:57:10 +0000 |
| commit | 80a9fe652bff8fb9ff6e010a29f24a0afc362ea7 (patch) | |
| tree | af32be085b783cf9700660bbc0117b734e69a4e4 | |
| parent | fc8512b5dfa5b3977f1571f50b2700f790191f92 (diff) | |
Resolves: fdo#59586 Missing comma in particular PDF file
regression from d9e4c74811855de15f1bf2045c2c9b061a2d4dc6
- if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang )
+ if (MsLangId::isKorean(aLang))
should obviously have been
- if ( LANGUAGE_KOREAN != aLang && LANGUAGE_KOREAN_JOHAB != aLang )
+ if (!MsLangId::isKorean(aLang))
Change-Id: I5d4407729c46111fc080e24b6a86d6740faa0f81
(cherry picked from commit e029e7394b972fd72930c8c475f3768dd99fe673)
Reviewed-on: https://gerrit.libreoffice.org/1839
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f3a0e72261419554d0cd3984a0e8f800ed587d49)
Reviewed-on: https://gerrit.libreoffice.org/1845
Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 7842c115e975..293d348da146 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -94,7 +94,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr LanguageType aLang = rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) { const SwLinePortion* pPor = rPor.GetPortion(); if ( pPor && ( pPor->IsKernPortion() || @@ -202,7 +202,7 @@ static sal_uInt16 lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr LanguageType aLang = rInf.GetTxtFrm()->GetTxtNode()->GetLang( nPos, 1, nNextScript ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) ++nCnt; } } diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 10bb745eea94..3609b8b553b8 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -1085,7 +1085,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) if ( ( SW_CJK == nActual || SW_LATIN == nActual ) && nSpaceAdd ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -1261,7 +1261,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -1472,7 +1472,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) @@ -2042,7 +2042,7 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) { LanguageType aLang = rInf.GetFont()->GetLanguage( SW_CJK ); - if (MsLangId::isKorean(aLang)) + if (!MsLangId::isKorean(aLang)) { long nSpaceSum = nSpaceAdd; for ( sal_uInt16 nI = 0; nI < rInf.GetLen(); ++nI ) |