[patch] matches the new colour field name in wv2-0.4.0 headers

kword-2.0.2-wv2-0.4.0.patch (text/plain), 1.95 KB, created by Arttu Valo on 2009-09-30 20:32:04 UTC

diff -ur kword-2.0.2.old/filters/kword/msword-odf/conversion.cpp kword-2.0.2/filters/kword/msword-odf/conversion.cpp
--- kword-2.0.2.old/filters/kword/msword-odf/conversion.cpp	2009-09-30 23:02:10.000000000 +0300
+++ kword-2.0.2/filters/kword/msword-odf/conversion.cpp	2009-09-30 23:03:04.000000000 +0300
@@ -272,7 +272,7 @@
     QString color( "#000000" ); //reasonable default
 
     //TODO fix this!
-    //setColorAttributes( borderElement, brc.ico, prefix, false );
+    //setColorAttributes( borderElement, brc.cv, prefix, false );
 
     //borderElement.setAttribute( prefix.isNull() ? "width" : prefix+"Width",
     //                            (double)brc.dptLineWidth / 8.0 );
@@ -321,7 +321,7 @@
     // We ignore brc.dptSpace (spacing), brc.fShadow (shadow), and brc.fFrame (?)
     
     //set up color
-    color = Conversion::color( brc.ico, -1 );
+    color = Conversion::color( brc.cv, -1 );
 
     QString value( width );
     value.append( " " );
diff -ur kword-2.0.2.old/filters/kword/msword-odf/tablehandler.cpp kword-2.0.2/filters/kword/msword-odf/tablehandler.cpp
--- kword-2.0.2.old/filters/kword/msword-odf/tablehandler.cpp	2009-09-30 23:11:49.000000000 +0300
+++ kword-2.0.2/filters/kword/msword-odf/tablehandler.cpp	2009-09-30 23:12:38.000000000 +0300
@@ -229,11 +229,11 @@
     const wvWare::Word97::BRC& brcTop = tc.brcTop;
     const wvWare::Word97::BRC& brcBottom = tc.brcBottom;
     const wvWare::Word97::BRC& brcLeft =
-     ( tc.brcLeft.ico == 255 && tc.brcLeft.dptLineWidth == 255 && m_column > 0 ) ?
+     ( tc.brcLeft.cv == 255 && tc.brcLeft.dptLineWidth == 255 && m_column > 0 ) ?
         m_tap->rgtc[ m_column - 1 ].brcRight
         : tc.brcLeft;
     const wvWare::Word97::BRC& brcRight =
-      ( tc.brcRight.ico == 255 && tc.brcRight.dptLineWidth == 255 && m_column < nbCells - 1 ) ?
+      ( tc.brcRight.cv == 255 && tc.brcRight.dptLineWidth == 255 && m_column < nbCells - 1 ) ?
         m_tap->rgtc[ m_column + 1 ].brcLeft
         : tc.brcRight;