diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2009-11-02 11:26:18 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2009-11-02 11:26:18 +0100 |
commit | 1fc7845ffa5ee5842ab650ac7aaab0638fc4b4e4 (patch) | |
tree | 3ae5d57221963c9fe52caf2fb9f661df767bc9ce | |
parent | 04070854472609cbc7b0f5e3419a8bba0ef79153 (diff) | |
parent | e7a5d9d3e189590ee054f2ec84d649e35a5a267e (diff) |
CWS-TOOLING: integrate CWS oooimprovement5_DEV300
Notes
Notes:
split repo tag: writer_ooo/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; |