[ooo-build-commit] Branch 'ooo/OOO320' - sw/source

[Jan Holesovsky]

 sw/source/core/txtnode/fntcache.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5f5965dbb869bfea259ab04b7209ba96b1549b0a
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Oct 27 12:27:51 2009 +0000

    CWS-TOOLING: integrate CWS oooimprovement5
    2009-10-14 15:43:16 +0200 b_michaelsen  r276902 : #i105835# removing explict flushes in comphelper as logging::Logger handles flushing
    2009-10-14 15:40:00 +0200 b_michaelsen  r276901 : #i105835# logging::Filehandler::flush flushes, logging::Logger::publish flushes all handlers
    2009-10-14 14:56:03 +0200 b_michaelsen  r276900 : #i105835# flushing filehandler in uieventslogger after each logged record because of buffered i/o
    2009-10-14 14:52:32 +0200 b_michaelsen  r276899 : #i105835# loading the user feedback log readonly with the csv-filter (no need for an import dialog)
    2009-10-14 14:40:46 +0200 od  r276898 : #i105571# method <SwFntObj::GetCrsrOfst(..)>
              - skip character cells also for CJK

diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 6b8d098..6f83edd 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;