[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/lib/kotext
From:       David Faure <faure () kde ! org>
Date:       2004-09-06 12:24:28
Message-ID: 20040906122428.CD1AB1773 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

korichtext.cpp: merge commit from iastrubni in qt-copy
kotextformatter.cc: un-merge Qt code which skipped formatting the trailing space,
apparently necessary in KOffice.

cuco: please re-test (it looks fine to me now)
CCMAIL: 88906-done@bugs.kde.org


  M +2 -1      korichtext.cpp   1.141
  M +4 -0      kotextformatter.cc   1.91


--- koffice/lib/kotext/korichtext.cpp  #1.140:1.141
@@ -1493,4 +1493,5 @@ void KoTextString::checkBidi() const
     // determines the properties we need for layouting
     QTextEngine textEngine( toString(), 0 );
+    textEngine.direction = (QChar::Direction) dir;
     textEngine.itemize(QTextEngine::SingleLine);
     const QCharAttributes *ca = textEngine.attributes() + length-1;
@@ -1527,5 +1528,5 @@ void KoTextString::checkBidi() const
         that->rightToLeft = FALSE;
     } else {
-        that->rightToLeft = (textEngine.items[0].analysis.bidiLevel % 2);
+        that->rightToLeft = (textEngine.direction == QChar::DirR);
     }
 }

--- koffice/lib/kotext/kotextformatter.cc  #1.90:1.91
@@ -933,4 +933,7 @@ KoTextParagLineStart *KoTextFormatterCor
     KoTextStringChar *startChar, KoTextStringChar *lastChar, int align, int space )
 {
+    // This comes from Qt (3.3.x) but seems wrong: the last space is where we draw
+    // the "end of paragraph" sign, so it needs to be correctly positioned too.
+#if 0
     // ignore white space at the end of the line.
     int endSpaces = 0;
@@ -940,4 +943,5 @@ KoTextParagLineStart *KoTextFormatterCor
         ++endSpaces;
     }
+#endif
 
     int start = (startChar - &text->at(0));


[prev in list] [next in list] [prev in thread] [next in thread]