CWS-TOOLING: integrate CWS oooimprovement5_DEV300

1fc7845f · Vladimir Glazunov · 04070854 · e7a5d9d3 · 1fc7845f
Kaydet (Commit) 1fc7845f authored Kas 02, 2009 tarafından Vladimir Glazunov
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

fntcache.cxx sw/source/core/txtnode/fntcache.cxx +5 -1

No files found.
--- 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;