Update to new wv2 headers

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1082110 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

filters/kword/msword/conversion.cpp

@@ -295,7 +295,7 @@ void Conversion::setColorAttributes( QDomElement& element, int ico, const QStrin
 
 void Conversion::setBorderAttributes( QDomElement& borderElement, const wvWare::Word97::BRC& brc, const QString& prefix )
 {
-    setColorAttributes( borderElement, brc.ico, prefix, false );
+    setColorAttributes( borderElement, brc.cv, prefix, false );
 
     borderElement.setAttribute( prefix.isNull() ? "width" : prefix+"Width",
                                 (double)brc.dptLineWidth / 8.0 );

filters/kword/msword/document.cpp

@@ -390,13 +390,13 @@ void Document::generateFrameBorder( QDomElement& frameElementOut, const wvWare::
 {
     // Frame borders
 
-    if ( brcTop.ico != 255 && brcTop.dptLineWidth != 255 ) // see tablehandler.cpp
+    if ( brcTop.cv != 255 && brcTop.dptLineWidth != 255 ) // see tablehandler.cpp
         Conversion::setBorderAttributes( frameElementOut, brcTop, "t" );
-    if ( brcBottom.ico != 255 && brcBottom.dptLineWidth != 255 ) // see tablehandler.cpp
+    if ( brcBottom.cv != 255 && brcBottom.dptLineWidth != 255 ) // see tablehandler.cpp
         Conversion::setBorderAttributes( frameElementOut, brcBottom, "b" );
-    if ( brcLeft.ico != 255 && brcLeft.dptLineWidth != 255 ) // could still be 255, for first column
+    if ( brcLeft.cv != 255 && brcLeft.dptLineWidth != 255 ) // could still be 255, for first column
         Conversion::setBorderAttributes( frameElementOut, brcLeft, "l" );
-    if ( brcRight.ico != 255 && brcRight.dptLineWidth != 255 ) // could still be 255, for last column
+    if ( brcRight.cv != 255 && brcRight.dptLineWidth != 255 ) // could still be 255, for last column
         Conversion::setBorderAttributes( frameElementOut, brcRight, "r" );
 
     // Frame background brush (color and fill style)

filters/kword/msword/tablehandler.cpp

@@ -169,11 +169,11 @@ void KWordTableHandler::tableCellStart()
     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;