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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/import
From:       Andreas Kling <info () andreaskling ! com>
Date:       2009-10-16 19:09:16
Message-ID: 1255720156.662884.31329.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1036189 by kling:

Fixed a crash when loading certain RTF files.

BUG: 189986


 M  +4 -4      rtfimport.cpp  


--- trunk/koffice/filters/kword/rtf/import/rtfimport.cpp #1036188:1036189
@@ -2378,8 +2378,8 @@
         if (border.style != RTFBorder::None || border.width > 0)
         {
             node.addNode( borderN[i] );
-              node.addColor( (border.color >= colorTable.count())
-                             ? QColor(Qt::black) : colorTable[border.color] );
+              node.addColor( (border.color < colorTable.count() && border.color >= 0)
+                             ? colorTable[border.color] : QColor(Qt::black) );
               node.setAttribute( "style", (int)border.style & 0xf );
               node.setAttribute( "width", (border.width < 20) ? 1 : border.width /20 );
             node.closeNode( borderN[i] );
@@ -2578,8 +2578,8 @@
                 if (border.style != RTFBorder::None || border.width > 0)
                 {
                     const char *id = "lrtb";
-                    QColor c = (border.color >= colorTable.count())
-                                ? QColor(Qt::black) : colorTable[border.color];
+                    QColor c = (border.color < colorTable.count() && border.color >= 0)
+                                ? QColor(colorTable[border.color]) : QColor(Qt::black);
                     frameSets.addBorder( (int)id[i], c, (int)border.style & 0x0f,
                                          .05*(!border.width ? 10 : border.width) );
                 }
[prev in list] [next in list] [prev in thread] [next in thread]