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

List:       kde-commits
Subject:    koffice/lib/kformula
From:       Ulrich Kuettler <ulrich.kuettler () mailbox ! tu-dresden ! de>
Date:       2003-03-13 19:09:47
[Download RAW message or body]

CVS commit by kuettler: 

Fix newly introduced bug: drawing of symbols.


  M +6 -0      sequenceparser.cc   1.18
  M +1 -1      textelement.cc   1.65


--- koffice/lib/kformula/sequenceparser.cc  #1.17:1.18
@@ -160,4 +160,7 @@ void SequenceParser::readText()
     BasicElement* element = list.at( tokenStart );
     TextElement* beginText = static_cast<TextElement*>( element );
+    if ( beginText->isSymbol() ) {
+        return;
+    }
     char format = beginText->format();
     type = ORDINARY;
@@ -171,4 +174,7 @@ void SequenceParser::readText()
         }
         if ( static_cast<TextElement*>( element )->format() != format ) {
+            return;
+        }
+        if ( static_cast<TextElement*>( element )->isSymbol() ) {
             return;
         }

--- koffice/lib/kformula/textelement.cc  #1.64:1.65
@@ -166,5 +166,5 @@ void TextElement::draw( QPainter& painte
     // Each starting element draws the whole token
     ElementType* token = getElementType();
-    if ( ( token != 0 ) && token->multiElement() ) {
+    if ( ( token != 0 ) && ( token->end()-token->start() > 1 ) ) {
         painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
                           context.layoutUnitToPixelY( myPos.y()+getBaseline() ),


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