CVS commit by wtrobin: 

Minor API change for table callbacks, bumped the version requirement.

If you want to use that filter you now need libwv2-0.0.6 or newer. Please
inform me about any problems you have with 0.0.6 (it depends on a different
OLE library, libgsf, available at ftp://ftp.gnome.org/pub/GNOME/sources/libgsf)

libgsf itself depends on glib-2 and libxml-2, and it needs .pc files of those
libraries as the build system uses pkg-config.

CCMAIL:koffice-devel@mail.kde.org


  M +1 -1      configure.in.bot   1.5
  M +2 -3      configure.in.in   1.8
  M +0 -5      tablehandler.cpp   1.3
  M +0 -2      tablehandler.h   1.3


--- koffice/filters/kword/msword/configure.in.bot  #1.4:1.5
@@ -1,5 +1,5 @@
 if test -z "$LIBWV2_LIBS"; then
   echo ""
-  echo "You're missing libwv2 0.0.4 or newer. KWord's MS Word filter will not be"
+  echo "You're missing libwv2 0.0.6 or newer. KWord's MS Word filter will not be"
   echo "compiled. You can download wv2 using anonymous CVS from the Sourceforge"
   echo "repository (http://sourceforge.net/cvs/?group_id=10501) or get a"

--- koffice/filters/kword/msword/configure.in.in  #1.7:1.8
@@ -25,5 +25,5 @@
 if test -n "$WV2_CONFIG"; then
   vers=`$WV2_CONFIG --version 2>/dev/null | sed -e 's/libwv2 //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-  if test -n "$vers" && test "$vers" -ge 4
+  if test -n "$vers" && test "$vers" -ge 6
   then
      LIBWV2_LIBS="`$WV2_CONFIG --libs`"
@@ -41,5 +41,5 @@
      AC_DEFINE_UNQUOTED(HAVE_WV2, 1, [Defines if your system has the wv2 library])
   else
-     AC_MSG_WARN([You need at least libwv2 0.0.4])
+     AC_MSG_WARN([You need at least libwv2 0.0.6])
   fi
 fi

--- koffice/filters/kword/msword/tablehandler.cpp  #1.2:1.3
@@ -32,9 +32,4 @@ KWordTableHandler::KWordTableHandler()
 }
 
-void KWordTableHandler::tableRowFound( const wvWare::TableRowFunctor& tableRowFunctor )
-{
-    // This one has moved to the text handler
-}
-
 void KWordTableHandler::tableRowStart( wvWare::SharedPtr<const wvWare::Word97::TAP> /*tap*/ )
 {

--- koffice/filters/kword/msword/tablehandler.h  #1.2:1.3
@@ -52,6 +52,4 @@ public:
 
     //////// TableHandler interface
-    virtual void tableRowFound( const wvWare::TableRowFunctor& tableRowFunctor );
-
     virtual void tableRowStart( wvWare::SharedPtr<const wvWare::Word97::TAP> tap );
     virtual void tableRowEnd();


_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/koffice-devel