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 | 58b46ffc5a4bebd91548a4bfc2317189bbdb2889 (patch) | |
tree | 508ddd96cb45a730c28d636e9255b7aa54fbe299 | |
parent | d21c39abb8529540853982e657a7464a439c9b29 (diff) | |
parent | 380cc1a7b30b7fc52bd036f1db01c5150c5a9e0c (diff) |
CWS-TOOLING: integrate CWS oooimprovement5_DEV300ooo/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 6b8d098618..6f83edd429 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; |