[Libreoffice-commits] .: writerperfect/prj writerperfect/source writerperfect/util

[Fridrich Strba]

 writerperfect/prj/build.lst                       |    5 +++--
 writerperfect/source/vsdimp/VisioImportFilter.cxx |    1 +
 writerperfect/util/makefile.mk                    |   10 ++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 5c4f1a61c70931c3066dc9c4bc4ea39a3abef09c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 17 12:42:09 2011 +0200

    Make writerperfect actually build again

diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 4e083ae..4c73290 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,8 +1,9 @@
-wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
 wp	writerperfect			usr1	-	all	wp_mkout NULL
 wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
 wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
 wp	writerperfect\source\wpdimp	nmake	-	all	wp_wpdimp NULL
 wp	writerperfect\source\wpsimp	nmake	-	all	wp_wpsimp NULL
 wp  writerperfect\source\wpgimp nmake   -   all wp_wpgimp NULL
-wp	writerperfect\util		nmake	-	all	wp_util wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL
+wp  writerperfect\source\vsdimp nmake   -   all wp_vsdimp NULL
+wp	writerperfect\util		nmake	-	all	wp_util wp_vsdimp wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL
diff --git a/writerperfect/source/vsdimp/VisioImportFilter.cxx b/writerperfect/source/vsdimp/VisioImportFilter.cxx
index 669b9de..4bfb831 100644
--- a/writerperfect/source/vsdimp/VisioImportFilter.cxx
+++ b/writerperfect/source/vsdimp/VisioImportFilter.cxx
@@ -46,6 +46,7 @@
 
 #include <xmloff/attrlist.hxx>
 
+#include <libvisio/libvisio.h>
 #include "filter/DocumentHandler.hxx"
 #include "filter/OdgGenerator.hxx"
 #include "VisioImportFilter.hxx"
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk
index de38569..6ec1968 100644
--- a/writerperfect/util/makefile.mk
+++ b/writerperfect/util/makefile.mk
@@ -25,6 +25,12 @@ LIBWPG=$(LIBWPG_LIBS)
 LIBWPG=-lwpglib
 .ENDIF
 
+.IF "$(SYSTEM_LIBVISIO)" == "YES"
+LIBWPG=$(LIBVISIO_LIBS)
+.ELSE
+LIBWPG=-lvisiolib
+.ENDIF
+
 .ELSE
 
 LIBWPD=$(LIBPRE) wpdlib.lib
@@ -117,11 +123,11 @@ SHL3LIBS = $(LIB3TARGET)
 SHL3VERSIONMAP = $(SOLARENV)/src/component.map
 DEF3NAME = $(SHL3TARGET)
 
-LIB4TARGET= $(SLB)$/wpgimport.lib
+LIB4TARGET= $(SLB)$/visioimport.lib
 LIB4FILES= \
     $(SLB)$/stream.lib  \
     $(SLB)$/filter.lib  \
-    $(SLB)$/vpsimp.lib
+    $(SLB)$/vsdimp.lib
 SHL4LIBS=$(LIB4TARGET)
 SHL4STDLIBS+= \
     $(SVLLIB)	\