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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/import
From:       Fredrik Edemar <f_edemar () linux ! se>
Date:       2005-04-14 16:08:42
Message-ID: 20050414160842.C81525FA () office ! kde ! org
[Download RAW message or body]

CVS commit by fedemar: 

Don't crash when the parser is reading a sequence with "\brdrr\brdrwN". \
"\brdrr\brdrwN", "\brdrl\brdrwN", "\brdrt\brdrwN" and "\brdrb\brdrwN" should also \
work now.

BUG: 90649
BUG: 98889
BUG: 100949


  M +3 -2      rtfimport.cpp   1.134


--- koffice/filters/kword/rtf/import/rtfimport.cpp  #1.133:1.134
@@ -917,7 +917,8 @@ void RTFImport::setBorderStyle( RTFPrope
 void RTFImport::setBorderProperty( RTFProperty *property )
 {
+    //kdDebug() << "setBorderProperty: " << endl;
     if (state.layout.border)
     {
-        *((int *)(state.layout.border + property->offset)) = token.value;
+        state.layout.border->width = token.value;
     }
     else
@@ -925,5 +926,5 @@ void RTFImport::setBorderProperty( RTFPr
         for (uint i=0; i < 4; i++)
         {
-            *((int *)(((char *)&state.layout.borders[i]) + property->offset)) = \
token.value; +            state.layout.borders[i].width = token.value;
         }
     }


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