diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-10 10:56:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-10 10:56:47 +0000 |
| commit | 617b7cf5225cbb540b3d125452f195d264b97745 (patch) | |
| tree | 776e18895199ee2193bf502c2a201ebf619b3d41 | |
| parent | 2b86d661f3ec0dbd879bb48be8cfe3c15bb62408 (diff) | |
| parent | 1fc7845ffa5ee5842ab650ac7aaab0638fc4b4e4 (diff) | |
cmcfixes66: merge with DEV300 m64
| -rw-r--r-- | sw/source/core/txtnode/fntcache.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 9952c50e678d..826398ec2ce6 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2424,8 +2424,12 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) const xub_StrLen nEnd = rInf.GetIdx() + rInf.GetLen(); // skip character cells for complex scripts - if ( rInf.GetFont() && SW_CTL == rInf.GetFont()->GetActual() && + // --> OD 2009-10-14 #i105571# - skip also character cells for CJK + if ( rInf.GetFont() && + ( SW_CTL == rInf.GetFont()->GetActual() || + SW_CJK == rInf.GetFont()->GetActual() ) && pBreakIt->GetBreakIter().is() ) + // <-- { aLang = rInf.GetFont()->GetLanguage(); bSkipCell = sal_True; |