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

List:       kde-commits
Subject:    koffice/filters/kword/rtf/export
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-02-06 8:28:54
Message-ID: 20040206082854.07E92991F () office ! kde ! org
[Download RAW message or body]

CVS commit by goutte: 

Be careful that underline and strikeout might differ in the parameters


  M +11 -4     ExportFilter.cc   2.98


--- koffice/filters/kword/rtf/export/ExportFilter.cc  #2.97:2.98
@@ -1347,5 +1347,9 @@ QString RTFWorker::textFormatToRtf(const
     }
 
-    if (force || (formatOrigin.underline!=formatData.underline))
+    if ( force
+        || ( formatOrigin.underline != formatData.underline )
+        || ( formatOrigin.underlineValue != formatData.underlineValue )
+        || ( formatOrigin.underlineStyle != formatData.underlineStyle )
+        || ( formatOrigin.underlineWord != formatData.underlineWord ) )
     {
         if ( formatData.underline )
@@ -1391,5 +1395,8 @@ QString RTFWorker::textFormatToRtf(const
     }
 
-    if (force || (formatOrigin.strikeout!=formatData.strikeout))
+    if ( force
+        || ( formatOrigin.strikeout != formatData.strikeout )
+        || ( formatOrigin.strikeoutType != formatData.strikeoutType )
+        )
     {
         if ( formatData.strikeout )


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