Menu
▾
▴
libwpd-cvs — CVS commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(4) |
Jun
(28) |
Jul
(15) |
Aug
(23) |
Sep
(2) |
Oct
(13) |
Nov
(26) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(1) |
Feb
(2) |
Mar
(5) |
Apr
(4) |
May
(70) |
Jun
(32) |
Jul
(27) |
Aug
(25) |
Sep
(8) |
Oct
(16) |
Nov
(30) |
Dec
(30) |
| 2007 |
Jan
(17) |
Feb
(7) |
Mar
(6) |
Apr
(36) |
May
(19) |
Jun
(82) |
Jul
(99) |
Aug
(44) |
Sep
(60) |
Oct
(106) |
Nov
(47) |
Dec
(37) |
| 2008 |
Jan
(5) |
Feb
(5) |
Mar
(4) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(20) |
Aug
(5) |
Sep
|
Oct
(95) |
Nov
(104) |
Dec
(23) |
| 2009 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
(46) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fridrich S. <str...@us...> - 2008-11-17 12:34:49
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9388/src/csharp Modified Files: wpd-0.9.dll.config.in Log Message: a small fix + adding win32 packaging Index: wpd-0.9.dll.config.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/wpd-0.9.dll.config.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wpd-0.9.dll.config.in 17 Nov 2008 10:24:25 -0000 1.2 +++ wpd-0.9.dll.config.in 17 Nov 2008 12:34:44 -0000 1.3 @@ -5,7 +5,7 @@ <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> - <assemblyIdentity name="wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@" publicKeyToken="4ed7477c36077a8d"/> + <assemblyIdentity name="wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll" publicKeyToken="4ed7477c36077a8d"/> <bindingRedirect oldVersion="@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.0.0-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.@WPDBINDINGS_PREVIOUS_MICRO_VERSION@.0" newVersion="@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.@WPDBINDINGS_MICRO_VERSION@.0" /> </dependentAssembly> </assemblyBinding> |
|
From: Fridrich S. <str...@us...> - 2008-11-17 12:34:49
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9388 Modified Files: Makefile.am configure.in Added Files: libwpd-bindings-zip.in Log Message: a small fix + adding win32 packaging Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.am 6 Nov 2008 19:56:48 -0000 1.5 +++ Makefile.am 17 Nov 2008 12:34:44 -0000 1.6 @@ -11,6 +11,9 @@ rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz --nodeps @rm -f $(PACKAGE)-$(VERSION).tar.gz +zip: install + sh libwpd-bindings-zip + distclean-local: rm -rf *.cache *~ *.out --- NEW FILE: libwpd-bindings-zip.in --- #!/bin/sh # Build runtime and developer zipfiles for libwpd on Win32. JAVAZIP=libwpd-java-@WPDBINDINGS_VERSION@-MinGW.zip SHARPZIP=libwpd-sharp-@WPDBINDINGS_VERSION@-MinGW.zip cd $DESTDIR@prefix@ DLLDIR=lib [ -f bin/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll ] && \ [ -f bin/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll ] && \ DLLDIR=bin @STRIP@ --strip-all \ $DLLDIR/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ $DLLDIR/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll upx -qqq --best \ $DLLDIR/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ $DLLDIR/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll rm -f $JAVAZIP zip -q -r $JAVAZIP -@ <<EOF $DLLDIR/libwpd-java-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll share/java/wpd-0.9.jar EOF rm -f $SHARPZIP zip -q -r $SHARPZIP -@ <<EOF $DLLDIR/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll libexec/mono/gac/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@ libexec/mono/libwpd EOF Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure.in 14 Nov 2008 23:02:10 -0000 1.16 +++ configure.in 17 Nov 2008 12:34:44 -0000 1.17 @@ -174,6 +174,7 @@ AC_OUTPUT([ Makefile libwpd-bindings.spec +libwpd-bindings-zip build/Makefile build/win32/Makefile m4/Makefile |
|
From: Fridrich S. <str...@us...> - 2008-11-17 10:24:30
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2272/src/csharp Modified Files: Makefile.am wpd-0.9.dll.config.in Log Message: calling in the C# P/INVOKE the win32 DLL name and mapping it for other OS in the *.config file, so that the same bindings can be usable from .NET and mono Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile.am 14 Nov 2008 22:07:39 -0000 1.12 +++ Makefile.am 17 Nov 2008 10:24:25 -0000 1.13 @@ -88,9 +88,6 @@ install-exec-local: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll mkdir -p $(DESTDIR)$(libexecdir)/mono/gac $(DESTDIR)$(libexecdir)/mono/libwpd - if test x"@WPDBINDINGS_MICRO_VERSION@" = x"0"; then \ - rm -f wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.config; \ - fi gacutil \ -i wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ -check_refs \ @@ -108,7 +105,7 @@ wpd_sharp_wrap.cxx: swig -c++ $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) -csharp -outdir ./ -namespace org.libwpd -o ./wpd_sharp_wrap.cxx \ - -oh ./wpd_sharp_wrap.hxx -dllimport libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@ \ + -oh ./wpd_sharp_wrap.hxx -dllimport libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ $(top_srcdir)/src/wpd.i clean-local: Index: wpd-0.9.dll.config.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/wpd-0.9.dll.config.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- wpd-0.9.dll.config.in 6 Nov 2008 07:42:46 -0000 1.1 +++ wpd-0.9.dll.config.in 17 Nov 2008 10:24:25 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> <configuration> + <dllmap os="!windows,osx" dll="libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll" target="libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.so"/> + <dllmap os="osx" dll="libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll" target="libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dylib"/> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> |
|
From: Fridrich S. <str...@us...> - 2008-11-14 23:18:06
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20998/src/java Modified Files: test.sh.in Log Message: this should allow win32 tests without having to make install and have the {prefix}/bin in path. It nevertheless needs the libwpd-0.9.dll and libwpd-stream-0.9.dll in path Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/test.sh.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- test.sh.in 14 Nov 2008 23:02:10 -0000 1.4 +++ test.sh.in 14 Nov 2008 23:17:58 -0000 1.5 @@ -1,7 +1,7 @@ tmp=`mktemp -d` wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out (cd examples && \ -CLASSPATH="$CLASSPATH:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar" LD_LIBRARY_PATH=../.libs @JAVA@ wpd2raw @top_srcdir@/../src/java/examples/wp_test_document.wpd > $tmp/java.out) +PATH="$PATH:../.libs" CLASSPATH="$CLASSPATH:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar" LD_LIBRARY_PATH=../.libs @JAVA@ wpd2raw @top_srcdir@/../src/java/examples/wp_test_document.wpd > $tmp/java.out) diff -uw $tmp/cpp.out $tmp/java.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-14 23:18:05
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20998/src/csharp Modified Files: test.sh.in Log Message: this should allow win32 tests without having to make install and have the {prefix}/bin in path. It nevertheless needs the libwpd-0.9.dll and libwpd-stream-0.9.dll in path Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/test.sh.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test.sh.in 14 Nov 2008 23:02:10 -0000 1.5 +++ test.sh.in 14 Nov 2008 23:17:58 -0000 1.6 @@ -1,6 +1,6 @@ tmp=`mktemp -d` wpd2raw @top_srcdir@/src/csharp/examples/wp_test_document.wpd >$tmp/cpp.out -MONO_PATH="$MONO_PATH:./" LD_LIBRARY_PATH=./.libs mono ./examples/wpd2raw.exe @top_srcdir@/src/csharp/examples/wp_test_document.wpd > $tmp/csharp.out +PATH="$PATH:./.libs" MONO_PATH="$MONO_PATH:./" LD_LIBRARY_PATH=./.libs mono ./examples/wpd2raw.exe @top_srcdir@/src/csharp/examples/wp_test_document.wpd > $tmp/csharp.out diff -uw $tmp/cpp.out $tmp/csharp.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-14 23:02:22
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16544/src/csharp Modified Files: test.sh.in Log Message: trying to make the tests work on win32 too Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/test.sh.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- test.sh.in 6 Nov 2008 10:19:23 -0000 1.4 +++ test.sh.in 14 Nov 2008 23:02:10 -0000 1.5 @@ -1,7 +1,6 @@ tmp=`mktemp -d` -wpd2raw @WPDBINDINGS_TOP_SRCDIR@/src/csharp/examples/wp_test_document.wpd >$tmp/cpp.out -(cd examples && \ -MONO_PATH="$MONO_PATH:../" LD_LIBRARY_PATH=../.libs mono ./wpd2raw.exe @WPDBINDINGS_TOP_SRCDIR@/src/csharp/examples/wp_test_document.wpd > $tmp/csharp.out) +wpd2raw @top_srcdir@/src/csharp/examples/wp_test_document.wpd >$tmp/cpp.out +MONO_PATH="$MONO_PATH:./" LD_LIBRARY_PATH=./.libs mono ./examples/wpd2raw.exe @top_srcdir@/src/csharp/examples/wp_test_document.wpd > $tmp/csharp.out diff -uw $tmp/cpp.out $tmp/csharp.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-14 23:02:22
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16544/src/java Modified Files: test.sh.in Log Message: trying to make the tests work on win32 too Index: test.sh.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/test.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test.sh.in 6 Nov 2008 10:19:23 -0000 1.3 +++ test.sh.in 14 Nov 2008 23:02:10 -0000 1.4 @@ -1,7 +1,7 @@ tmp=`mktemp -d` -wpd2raw @WPDBINDINGS_TOP_SRCDIR@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out +wpd2raw @top_srcdir@/src/java/examples/wp_test_document.wpd >$tmp/cpp.out (cd examples && \ -CLASSPATH=$CLASSPATH:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar LD_LIBRARY_PATH=../.libs @JAVA@ wpd2raw @WPDBINDINGS_TOP_SRCDIR@/src/java/examples/wp_test_document.wpd > $tmp/java.out) +CLASSPATH="$CLASSPATH:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar" LD_LIBRARY_PATH=../.libs @JAVA@ wpd2raw @top_srcdir@/../src/java/examples/wp_test_document.wpd > $tmp/java.out) diff -uw $tmp/cpp.out $tmp/java.out if [ $? == 0 ]; then echo ok |
|
From: Fridrich S. <str...@us...> - 2008-11-14 23:02:22
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16544 Modified Files: configure.in Log Message: trying to make the tests work on win32 too Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure.in 7 Nov 2008 05:12:51 -0000 1.15 +++ configure.in 14 Nov 2008 23:02:10 -0000 1.16 @@ -62,10 +62,6 @@ AC_PROG_LIBTOOL -AC_SUBST(WPDBINDINGS_OBJDIR, [$objdir]) - -AC_SUBST(WPDBINDINGS_TOP_SRCDIR, [$top_srcdir]) - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) PKG_CHECK_MODULES(WPDBINDINGS,[ |
|
From: Fridrich S. <str...@us...> - 2008-11-14 22:07:47
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java/org/libwpd In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13666/src/java/org/libwpd Modified Files: WPDocumentJava.java Log Message: kill in win32 dlls the @<number> postfix to the exported symbols so that the jni and C# can dlopen the dll + fix some ambiguities with names of libraries to load from java bindings (win32 wants the name to be libwpd-java-0.9 whereas linux wants it to be wpd-java-0.9) *** still remaining to fix the test.sh.in files so that they generate proper tests *** Index: WPDocumentJava.java =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/org/libwpd/WPDocumentJava.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WPDocumentJava.java 30 Oct 2008 16:20:55 -0000 1.3 +++ WPDocumentJava.java 14 Nov 2008 22:07:39 -0000 1.4 @@ -30,7 +30,14 @@ { static { - System.loadLibrary("wpd-java-0.9"); + try + { + System.loadLibrary("wpd-java-0.9"); + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.loadLibrary("libwpd-java-0.9"); + } } public static boolean isFileWordPerfectDocument(String file) |
|
From: Fridrich S. <str...@us...> - 2008-11-14 22:07:47
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13666/src/csharp Modified Files: Makefile.am Log Message: kill in win32 dlls the @<number> postfix to the exported symbols so that the jni and C# can dlopen the dll + fix some ambiguities with names of libraries to load from java bindings (win32 wants the name to be libwpd-java-0.9 whereas linux wants it to be wpd-java-0.9) *** still remaining to fix the test.sh.in files so that they generate proper tests *** Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 11 Nov 2008 14:12:13 -0000 1.11 +++ Makefile.am 14 Nov 2008 22:07:39 -0000 1.12 @@ -6,11 +6,14 @@ if PLATFORM_WIN32 no_undefined = -no-undefined +kill_at = -Wl,--kill-at else if PLATFORM_DARWIN no_undefined = -no-undefined +kill_at = else no_undefined = +kill_at = endif endif @@ -39,7 +42,7 @@ AM_CXXFLAGS = $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) -libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) $(kill_at) libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LIBADD = $(WPDBINDINGS_LIBS) @WPDSHARP_WIN32_RESOURCE@ libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_DEPENDENCIES = @WPDSHARP_WIN32_RESOURCE@ nodist_libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_SOURCES = wpd_sharp_wrap.cxx wpd_sharp_wrap.hxx @@ -105,7 +108,7 @@ wpd_sharp_wrap.cxx: swig -c++ $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) -csharp -outdir ./ -namespace org.libwpd -o ./wpd_sharp_wrap.cxx \ - -oh ./wpd_sharp_wrap.hxx -dllimport wpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@ \ + -oh ./wpd_sharp_wrap.hxx -dllimport libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@ \ $(top_srcdir)/src/wpd.i clean-local: |
|
From: Fridrich S. <str...@us...> - 2008-11-14 22:07:47
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13666/src/java Modified Files: Makefile.am Log Message: kill in win32 dlls the @<number> postfix to the exported symbols so that the jni and C# can dlopen the dll + fix some ambiguities with names of libraries to load from java bindings (win32 wants the name to be libwpd-java-0.9 whereas linux wants it to be wpd-java-0.9) *** still remaining to fix the test.sh.in files so that they generate proper tests *** Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.am 11 Nov 2008 14:12:13 -0000 1.19 +++ Makefile.am 14 Nov 2008 22:07:39 -0000 1.20 @@ -2,11 +2,14 @@ if PLATFORM_WIN32 no_undefined = -no-undefined +kill_at = -Wl,--kill-at else if PLATFORM_DARWIN no_undefined = -no-undefined +kill_at = else no_undefined = +kill_at = endif endif @@ -35,7 +38,7 @@ AM_CXXFLAGS = $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) -libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) +libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) $(kill_at) libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LIBADD = $(WPDBINDINGS_LIBS) @WPDJAVA_WIN32_RESOURCE@ libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_DEPENDENCIES = @WPDJAVA_WIN32_RESOURCE@ nodist_libwpd_java_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_SOURCES = wpd_java_wrap.cxx wpd_java_wrap.hxx @@ -50,7 +53,7 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java SWIGTYPE_p_void.java SWIGTYPE_p_WPXBinaryData.java \ +JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java \ SWIGTYPE_p_WPXEncryption.java WPDConfidence.java wpdConstants.java WPDFileFormat.java wpd.java wpdJNI.java \ WPDocument.java WPDPasswordMatch.java WPDResult.java WPXBinaryData.java WPXDocumentInterface.java WPXFileStream.java \ WPXInputStream.java WPXPropertyFactory.java WPXProperty.java WPXPropertyList_Iter.java WPXPropertyList.java \ @@ -76,12 +79,13 @@ wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar: org/libwpd/wpd.class @JAR@ -cf wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar org/libwpd/*.class -install-exec-local: install-jar - -install-jar: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar +install-exec-local: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar mkdir -p $(DESTDIR)$(prefix)/share/java install -m644 $^ $(DESTDIR)$(prefix)/share/java +uninstall-local: + rm -rf $(DESTDIR)$(prefix)/share/java/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar + check: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar sh test.sh |
|
From: Fridrich S. <str...@us...> - 2008-11-11 14:12:27
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26618/src/csharp Modified Files: Makefile.am Log Message: on 64-bit, mono is in /usr/lib and not in /usr/lib64 Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 7 Nov 2008 05:12:51 -0000 1.10 +++ Makefile.am 11 Nov 2008 14:12:13 -0000 1.11 @@ -84,20 +84,20 @@ $$SHARP_FILES install-exec-local: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll - mkdir -p $(DESTDIR)$(libdir)/mono/gac $(DESTDIR)$(libdir)/mono/libwpd + mkdir -p $(DESTDIR)$(libexecdir)/mono/gac $(DESTDIR)$(libexecdir)/mono/libwpd if test x"@WPDBINDINGS_MICRO_VERSION@" = x"0"; then \ rm -f wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.config; \ fi gacutil \ -i wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ -check_refs \ - -root $(DESTDIR)$(libdir) \ + -root $(DESTDIR)$(libexecdir) \ -package libwpd uninstall-local: gacutil \ -u wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@,Version=@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.@WPDBINDINGS_MICRO_VERSION@.0 \ - -root $(DESTDIR)$(libdir) \ + -root $(DESTDIR)$(libexecdir) \ -package libwpd check: all |
|
From: Fridrich S. <str...@us...> - 2008-11-11 14:12:22
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26618/src/java Modified Files: Makefile.am Log Message: on 64-bit, mono is in /usr/lib and not in /usr/lib64 Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile.am 7 Nov 2008 06:35:24 -0000 1.18 +++ Makefile.am 11 Nov 2008 14:12:13 -0000 1.19 @@ -50,11 +50,11 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java SWIGTYPE_p_WPXEncryption.java WPDConfidence.java \ - wpdConstants.java WPDFileFormat.java wpd.java wpdJNI.java WPDocument.java WPDPasswordMatch.java WPDResult.java \ - WPXBinaryData.java WPXDocumentInterface.java WPXFileStream.java WPXInputStream.java WPXPropertyFactory.java \ - WPXProperty.java WPXPropertyList_Iter.java WPXPropertyList.java WPXPropertyListVector_Iter.java \ - WPXPropertyListVector.java WPX_SEEK_TYPE.java WPXString.java WPXStringStream.java WPXUnit.java +JAVA_SWIG = SWIGTYPE_p_size_t.java SWIGTYPE_p_unsigned_char.java SWIGTYPE_p_void.java SWIGTYPE_p_WPXBinaryData.java \ + SWIGTYPE_p_WPXEncryption.java WPDConfidence.java wpdConstants.java WPDFileFormat.java wpd.java wpdJNI.java \ + WPDocument.java WPDPasswordMatch.java WPDResult.java WPXBinaryData.java WPXDocumentInterface.java WPXFileStream.java \ + WPXInputStream.java WPXPropertyFactory.java WPXProperty.java WPXPropertyList_Iter.java WPXPropertyList.java \ + WPXPropertyListVector_Iter.java WPXPropertyListVector.java WPX_SEEK_TYPE.java WPXString.java WPXStringStream.java WPXUnit.java JAVA_NOSWIG = WPDocumentJava.java WPXDocumentInterfaceProxy.java WPXDocumentJavaInterface.java |
|
From: Fridrich S. <str...@us...> - 2008-11-11 14:12:21
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26618 Modified Files: libwpd-bindings.spec.in Log Message: on 64-bit, mono is in /usr/lib and not in /usr/lib64 Index: libwpd-bindings.spec.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/libwpd-bindings.spec.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libwpd-bindings.spec.in 6 Nov 2008 19:56:49 -0000 1.3 +++ libwpd-bindings.spec.in 11 Nov 2008 14:12:12 -0000 1.4 @@ -39,7 +39,9 @@ %setup -q -n %{name}-%{version} %build -./configure --prefix=%{_prefix} +./configure --prefix=%{_prefix} \ + --libdir=%{_prefix}/%_lib \ + --libexecdir=%{_prefix}/lib %__make @@ -60,7 +62,7 @@ %files -n libwpd-sharp %defattr(644,root,root,755) %{_libdir}/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.so -%{_libdir}/mono/* +%{_prefix}/lib/mono/* %{_libdir}/pkgconfig/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.pc %changelog |
|
From: Fridrich S. <str...@us...> - 2008-11-11 10:26:33
|
Update of /cvsroot/libwpd/libwpd2/src/test In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5243/src/test Modified Files: test.cpp Log Message: make test compile Index: test.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/test/test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test.cpp 23 Nov 2007 21:31:57 -0000 1.5 +++ test.cpp 11 Nov 2008 10:26:29 -0000 1.6 @@ -139,7 +139,7 @@ /************************ * Test WPXStringStream * ************************/ - input = new WPXStringStream("\1\2\3\4\0\5\6\7", 8); + input = new WPXStringStream((const unsigned char *)"\1\2\3\4\0\5\6\7", 8); CPPUNIT_ASSERT_EQUAL ( false, input->isOLEStream() ); CPPUNIT_ASSERT_EQUAL ( (WPXInputStream*) NULL, input->getDocumentOLEStream("foo") ); |
|
From: Fridrich S. <str...@us...> - 2008-11-11 10:23:12
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5029/src/lib Modified Files: WP3ContentListener.cpp WP5ContentListener.cpp Log Message: more work on frame positions in WP3 parser and start to work on the same in WP5 parser Index: WP3ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- WP3ContentListener.cpp 9 Nov 2008 08:56:27 -0000 1.42 +++ WP3ContentListener.cpp 11 Nov 2008 10:23:01 -0000 1.43 @@ -940,6 +940,129 @@ else if ( ( figureFlags & 0x0300 ) == 0x0100 ) // page { propList.insert("text:anchor-type", "char"); + + if ( ( figureFlags & 0x1f08 ) == 0x0100 ) // full page + { + propList.insert("svg:width", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight ) ); + propList.insert("svg:height", (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom ) ); + propList.insert("style:vertical-rel", "page-content" ); + propList.insert("style:vertical-pos", "middle" ); + propList.insert("style:horizontal-rel", "page-content" ); + propList.insert("style:horizontal-pos", "center" ); + } + else if ( ( figureFlags & 0x1f08 ) == 0x1108 ) // abs. page + { + propList.insert("style:vertical-rel", "page" ); + propList.insert("style:vertical-pos", "from-top" ); + propList.insert("svg:y", (float)((double)verticalOffset/72.0f)); + propList.insert("style:horizontal-rel", "page-start-margin" ); + propList.insert("style:horizontal-pos", "from-left" ); + propList.insert("svg:x", (float)((double)horizontalOffset/72.0f)); + } + else + { + propList.insert("style:vertical-rel", "page-content" ); + propList.insert("style:horizontal-rel", "page-content" ); + switch ( ( figureFlags & 0x1c00 ) >> 10 ) + { + case 0x00: + propList.insert("svg:height", (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom ) ); + propList.insert("style:vertical-rel", "page-content" ); + propList.insert("style:vertical-pos", "middle" ); + break; + case 0x01: + if ( verticalOffset == 0.0) + propList.insert("style:vertical-pos", "top" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)((double)verticalOffset/72.0f); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f) ) + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f); + propList.insert("svg:y", newPosition); + } + break; + case 0x02: + if (verticalOffset == 0.0) + propList.insert("style:vertical-pos", "middle" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)((m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f)/2.0f); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f) ) + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f); + propList.insert("svg:y", newPosition); + } + break; + case 0x03: + if (verticalOffset == 0.0) + propList.insert("style:vertical-pos", "bottom" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f + (double)verticalOffset/72.0f); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f) ) + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/72.0f); + propList.insert("svg:y", newPosition); + } + break; + case 0x04: + propList.insert("style:vertical-rel", "page" ); + propList.insert("style:vertical-pos", "from-top" ); + propList.insert("svg:y", (float)((double)verticalOffset/72.0f)); + break; + default: + break; + } + + switch ( figureFlags & 0x0003 ) + { + case 0x00: + if ( horizontalOffset == 0.0 ) + propList.insert( "style:horizontal-pos", "left"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((double)horizontalOffset/72.0f)); + } + break; + case 0x01: + if ( horizontalOffset == 0.0 ) + propList.insert( "style:horizontal-pos", "right"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + - (double)width/72.0f + (double)horizontalOffset/72.0f)); + } + break; + case 0x02: + if ( horizontalOffset == 0.0 ) + propList.insert( "style:horizontal-pos", "center" ); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + - (double)width/72.0f)/2.0f + (double)horizontalOffset/72.0f)); + } + break; + case 0x03: + propList.insert("svg:width", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight ) ); + propList.insert("style:horizontal-rel", "page-content" ); + propList.insert("style:horizontal-pos", "center" ); + break; + default: + break; + } + } } else if ( ( figureFlags & 0x0300 ) == 0x0200 ) // character { Index: WP5ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ContentListener.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WP5ContentListener.cpp 29 Oct 2008 19:58:54 -0000 1.38 +++ WP5ContentListener.cpp 11 Nov 2008 10:23:01 -0000 1.39 @@ -602,8 +602,50 @@ m_defaultFontSize = fontSize; } -void WP5ContentListener::boxOn(uint8_t positionAndType, uint8_t /* alignment */, uint16_t width, uint16_t height, uint16_t x, uint16_t y) +void WP5ContentListener::boxOn(uint8_t positionAndType, uint8_t alignment, uint16_t width, uint16_t height, uint16_t x, uint16_t y) { +/* +Paragraph: + - Vertical position: + + offset from top of paragraph + - Horizontal position: + + Left + + Right + + Centre + + Full + +Page: + - Vertical position: + + Full Page + + Top + + Centre + + Bottom + + Set Position + * Offset from the top of page + - Horizontal position + + Margins + * Left + * Right + * Centre + * Full + + Columns (Which column) + * Left + * Right + * Centre + * Full + + Set Position + * Offset from left of page + +Character: + - Vertical position: + + Top + + Centre + + Bottom + + Baseline + - Horizontal Position: + + N/A +*/ + if (isUndoOn() || (m_ps->m_isTableOpened && !m_ps->m_isTableCellOpened)) return; @@ -617,8 +659,11 @@ propList.insert("svg:height", (float)((double)height/(double)WPX_NUM_WPUS_PER_INCH)); propList.insert("svg:width", (float)((double)width/(double)WPX_NUM_WPUS_PER_INCH)); - propList.insert("svg:x", (float)((double)x/(double)WPX_NUM_WPUS_PER_INCH)); - propList.insert("svg:y", (float)((double)y/(double)WPX_NUM_WPUS_PER_INCH)); + if ( alignment & 0x80 ) + propList.insert( "style:wrap", "dynamic" ); + else + propList.insert( "style:wrap", "none" ); + switch (positionAndType & 0x03) { @@ -631,6 +676,116 @@ case 0x02: // Char propList.insert("text:anchor-type", "as-char"); break; + default: + break; + } + + propList.insert("style:vertical-rel", "page-content"); + switch ( (positionAndType & 0x1c) >> 2 ) + { + case 0x00: + propList.insert("svg:height", (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom ) ); + propList.insert("style:vertical-rel", "page-content" ); + propList.insert("style:vertical-pos", "middle" ); + break; + case 0x01: + if ( y == 0.0) + propList.insert("style:vertical-pos", "top" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)((double)y/(double)WPX_NUM_WPUS_PER_INCH); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) + { + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH); + } + propList.insert("svg:y", newPosition); + } + break; + case 0x02: + if (y == 0.0) + propList.insert("style:vertical-pos", "middle" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)((m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH)/2.0f); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) + { + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH); + } + propList.insert("svg:y", newPosition); + } + break; + case 0x03: + if (y == 0.0) + propList.insert("style:vertical-pos", "bottom" ); + else + { + propList.insert("style:vertical-pos", "from-top" ); + float newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH + (double)y/(double)WPX_NUM_WPUS_PER_INCH); + if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) + { + newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH); + } + propList.insert("svg:y", newPosition); + } + break; + case 0x04: + propList.insert("style:vertical-rel", "page" ); + propList.insert("style:vertical-pos", "from-top" ); + propList.insert("svg:y", (float)((double)y/(double)WPX_NUM_WPUS_PER_INCH)); + break; + default: + break; + } + + propList.insert("style:horizontal-rel", "page-content" ); + switch ( alignment & 0x03 ) + { + case 0x00: + if ( x == 0.0 ) + propList.insert( "style:horizontal-pos", "left"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((double)x/(double)WPX_NUM_WPUS_PER_INCH)); + } + break; + case 0x01: + if ( x == 0.0 ) + propList.insert( "style:horizontal-pos", "right"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + - (double)width/(double)WPX_NUM_WPUS_PER_INCH + (double)x/(double)WPX_NUM_WPUS_PER_INCH)); + } + break; + case 0x02: + if ( x == 0.0 ) + propList.insert( "style:horizontal-pos", "center" ); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + - (double)width/(double)WPX_NUM_WPUS_PER_INCH)/2.0f + (double)x/(double)WPX_NUM_WPUS_PER_INCH)); + } + break; + case 0x03: + propList.insert("svg:width", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight ) ); + propList.insert("style:horizontal-rel", "page-content" ); + propList.insert("style:horizontal-pos", "center" ); + break; + default: + break; } m_documentInterface->openFrame(propList); |
|
From: Fridrich S. <str...@us...> - 2008-11-11 09:38:41
|
Update of /cvsroot/libwpd/writerperfect/wpd2sxw In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2757/wpd2sxw Modified Files: Tag: STABLE-0-7-0 StdOutHandler.cxx Log Message: an include to fix compilation with upcoming gcc-4.4.x Index: StdOutHandler.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/wpd2sxw/Attic/StdOutHandler.cxx,v retrieving revision 1.8.4.1 retrieving revision 1.8.4.2 diff -u -d -r1.8.4.1 -r1.8.4.2 --- StdOutHandler.cxx 10 Sep 2007 14:24:07 -0000 1.8.4.1 +++ StdOutHandler.cxx 11 Nov 2008 09:38:36 -0000 1.8.4.2 @@ -23,6 +23,7 @@ #include "StdOutHandler.hxx" #include <string.h> +#include <stdio.h> StdOutHandler::StdOutHandler() : mbIsTagOpened(false) |
|
From: Fridrich S. <str...@us...> - 2008-11-11 09:37:38
|
Update of /cvsroot/libwpd/writerperfect/cmdline In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2716/cmdline Modified Files: StdOutHandler.cxx Log Message: an include to fix compilation with upcoming gcc-4.4.x Index: StdOutHandler.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/cmdline/StdOutHandler.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- StdOutHandler.cxx 10 Sep 2007 14:34:43 -0000 1.3 +++ StdOutHandler.cxx 11 Nov 2008 09:37:29 -0000 1.4 @@ -21,6 +21,7 @@ #include "StdOutHandler.hxx" #include <string.h> +#include <stdio.h> StdOutHandler::StdOutHandler() : mbIsTagOpened(false) |
|
From: Fridrich S. <str...@us...> - 2008-11-09 08:57:56
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30292/filter Modified Files: WordPerfectCollector.cxx Log Message: addapt to the new style:wrap property of a frame Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- WordPerfectCollector.cxx 29 Oct 2008 20:00:26 -0000 1.65 +++ WordPerfectCollector.cxx 9 Nov 2008 08:57:49 -0000 1.66 @@ -1120,6 +1120,9 @@ if (propList["fo:max-height"]) frameStylePropertiesOpenElement->addAttribute("fo:max-height", propList["fo:max-height"]->getStr()); + + if (propList["style:wrap"]) + frameStylePropertiesOpenElement->addAttribute("style:wrap", propList["style:wrap"]->getStr()); mFrameStyles.push_back(frameStylePropertiesOpenElement); |
|
From: Fridrich S. <str...@us...> - 2008-11-09 08:56:33
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30120/src/lib Modified Files: WP3ContentListener.cpp Log Message: more work on position of paragraph anchored boxes Index: WP3ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- WP3ContentListener.cpp 7 Nov 2008 17:24:22 -0000 1.41 +++ WP3ContentListener.cpp 9 Nov 2008 08:56:27 -0000 1.42 @@ -877,30 +877,65 @@ propList.insert("svg:width", (float)((double)width/72.0f)); propList.insert("svg:height", (float)((double)height/72.0f)); + if ( figureFlags & 0x0080 ) + propList.insert( "style:wrap", "dynamic" ); + else + propList.insert( "style:wrap", "none" ); + if ( ( figureFlags & 0x0300 ) == 0x0000 ) // paragraph { propList.insert("text:anchor-type", "paragraph"); propList.insert("style:vertical-rel", "paragraph" ); - propList.insert("style:vertical-pos", "paragraph" ); propList.insert("style:horizontal-rel", "paragraph"); switch ( figureFlags & 0x0003 ) { case 0x01: - propList.insert("style:horizontal-pos", "right"); + if (horizontalOffset == 0.0) + propList.insert("style:horizontal-pos", "right"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((double)horizontalOffset/72.0f - (double)width/72.0f + + (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - m_ps->m_sectionMarginLeft + - m_ps->m_sectionMarginRight - m_ps->m_paragraphMarginLeft - m_ps->m_paragraphMarginRight))); + } break; case 0x02: - propList.insert("style:horizontal-pos", "center"); + if (horizontalOffset == 0.0) + propList.insert("style:horizontal-pos", "center"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((double)horizontalOffset/72.0f - (double)width/(2.0f*72.0f) + + (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - m_ps->m_sectionMarginLeft + - m_ps->m_sectionMarginRight - m_ps->m_paragraphMarginLeft - m_ps->m_paragraphMarginRight)/2.0f)); + } break; case 0x03: + propList.insert("svg:width", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - m_ps->m_sectionMarginLeft + - m_ps->m_sectionMarginRight - m_ps->m_paragraphMarginLeft - m_ps->m_paragraphMarginRight) ); propList.insert("style:horizontal-pos", "center"); break; case 0x00: default: - propList.insert("style:horizontal-pos", "left"); + if (horizontalOffset == 0.0) + propList.insert("style:horizontal-pos", "left"); + else + { + propList.insert( "style:horizontal-pos", "from-left"); + propList.insert( "svg:x", (float)((double)horizontalOffset/72.0f)); + } break; } - - + + if (verticalOffset == 0.0) + propList.insert( "style:vertical-pos", "top" ); + else + { + propList.insert( "style:vertical-pos", "from-top" ); + propList.insert( "svg:y", (float)((double)verticalOffset/72.0f)); + } + } else if ( ( figureFlags & 0x0300 ) == 0x0100 ) // page { |
|
From: Fridrich S. <str...@us...> - 2008-11-07 17:24:34
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10080/src/lib Modified Files: WP3ContentListener.cpp WP3ContentListener.h WP3Listener.h WP3StylesListener.h WP3WindowGroup.cpp WP3WindowGroup.h WPXMemoryStream.h WPXStreamImplementation.cpp WPXStreamImplementation.h Log Message: some more information about wp3 frames handled + make the data returned by WPXInputStream::read be a pointer to unsigned string Index: WP3WindowGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3WindowGroup.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WP3WindowGroup.h 25 Oct 2008 14:30:04 -0000 1.5 +++ WP3WindowGroup.h 7 Nov 2008 17:24:23 -0000 1.6 @@ -44,7 +44,7 @@ private: uint16_t m_figureFlags; uint8_t m_leftColumn, m_rightColumn, m_boxType; - float m_width, m_height; + float m_width, m_height, m_horizontalOffset, m_verticalOffset; uint32_t m_resourceID; WP3SubDocument *m_subDocument, *m_caption; }; Index: WP3ContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WP3ContentListener.h 27 Oct 2008 13:06:49 -0000 1.28 +++ WP3ContentListener.h 7 Nov 2008 17:24:23 -0000 1.29 @@ -98,9 +98,11 @@ void leftIndent(float offset); void leftRightIndent(); void leftRightIndent(float offset); - void insertPicture(float height, float width, uint8_t leftColumn, uint8_t rightColumn, + void insertPicture(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, uint16_t figureFlags, const WPXBinaryData &binaryData); - void insertTextBox(float height, float width, uint8_t leftColumn, uint8_t rightColumn, + void insertTextBox(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags, const WP3SubDocument *subDocument, const WP3SubDocument *caption); + void insertWP51Table(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, uint16_t figureFlags, const WP3SubDocument *subDocument, const WP3SubDocument *caption); protected: @@ -109,6 +111,9 @@ void _flushText(); void _changeList() {}; + + void _handleFrameParameters( WPXPropertyList &propList, float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags ); private: WP3ContentListener(const WP3ContentListener&); Index: WP3WindowGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3WindowGroup.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- WP3WindowGroup.cpp 27 Oct 2008 13:06:49 -0000 1.8 +++ WP3WindowGroup.cpp 7 Nov 2008 17:24:23 -0000 1.9 @@ -38,6 +38,8 @@ m_boxType(0xFF), m_width(0.0f), m_height(0.0f), + m_horizontalOffset(0.0f), + m_verticalOffset(0.0f), m_resourceID(0), m_subDocument(NULL), m_caption(NULL) @@ -65,7 +67,7 @@ case WP3_WINDOW_GROUP_HTML_IMAGE_BOX_FUNCTION: { input->seek(14, WPX_SEEK_CUR); - readU16(input, encryption, true); // picture flags + m_figureFlags = readU16(input, encryption, true); // picture flags input->seek(2, WPX_SEEK_CUR); m_leftColumn = readU8(input, encryption); // left align column m_rightColumn = readU8(input, encryption); // right align column @@ -73,7 +75,8 @@ m_boxType = readU8(input, encryption); input->seek(1, WPX_SEEK_CUR); m_resourceID = readU16(input, encryption, true); - input->seek(8, WPX_SEEK_CUR); + m_verticalOffset = fixedPointToFloat(readU32(input, encryption, true)); + m_horizontalOffset = fixedPointToFloat(readU32(input, encryption, true)); m_width = fixedPointToFloat(readU32(input, encryption, true)); m_height = fixedPointToFloat(readU32(input, encryption, true)); input->seek(9, WPX_SEEK_CUR); @@ -116,7 +119,7 @@ if (listener->getResourceFork()->getResource(0x57424f58, m_resourceID)) // WBOX resource { tmpWBOXData.append(listener->getResourceFork()->getResource(0x57424f58, m_resourceID)->getResourceData()); - listener->insertPicture(m_height, m_width, m_leftColumn, m_rightColumn, m_figureFlags, tmpWBOXData); + listener->insertPicture(m_height, m_width, m_verticalOffset, m_horizontalOffset, m_leftColumn, m_rightColumn, m_figureFlags, tmpWBOXData); } } else if (m_boxType == 0x01 || m_boxType == 0x03) @@ -127,13 +130,18 @@ if (listener->getResourceFork()->getResource(0x50494354, m_resourceID)) // replacement picture in PICT format { tmpPICTData.append(listener->getResourceFork()->getResource(0x50494354, m_resourceID)->getResourceData()); - listener->insertPicture(m_height, m_width, m_leftColumn, m_rightColumn, m_figureFlags, tmpPICTData); + listener->insertPicture(m_height, m_width, m_verticalOffset, m_horizontalOffset, m_leftColumn, m_rightColumn, m_figureFlags, tmpPICTData); } } else if (m_boxType == 0x00) { if (m_subDocument || m_caption) - listener->insertTextBox(m_height, m_width, m_leftColumn, m_rightColumn, m_figureFlags, m_subDocument, m_caption); + listener->insertTextBox(m_height, m_width, m_verticalOffset, m_horizontalOffset, m_leftColumn, m_rightColumn, m_figureFlags, m_subDocument, m_caption); + } + else if (m_boxType == 0x04 || m_boxType == 0x05) + { + if (m_subDocument || m_caption) + listener->insertWP51Table(m_height, m_width, m_verticalOffset, m_horizontalOffset, m_leftColumn, m_rightColumn, m_figureFlags, m_subDocument, m_caption); } break; Index: WP3StylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3StylesListener.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- WP3StylesListener.h 27 Oct 2008 13:06:49 -0000 1.27 +++ WP3StylesListener.h 7 Nov 2008 17:24:23 -0000 1.28 @@ -83,9 +83,11 @@ void leftIndent(float /* offset */) {} void leftRightIndent() {} void leftRightIndent(float /* offset */) {} - void insertPicture(float /* height */, float /* width */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + void insertPicture(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t /* figureFlags */, const WPXBinaryData & /* binaryData */) {} - void insertTextBox(float /* height */, float /* width */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + void insertTextBox(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + uint16_t /* figureFlags */, const WP3SubDocument * /* subDocument */, const WP3SubDocument * /* caption */) {} + void insertWP51Table(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t /* figureFlags */, const WP3SubDocument * /* subDocument */, const WP3SubDocument * /* caption */) {} protected: Index: WPXStreamImplementation.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStreamImplementation.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- WPXStreamImplementation.cpp 4 Dec 2007 19:56:13 -0000 1.15 +++ WPXStreamImplementation.cpp 7 Nov 2008 17:24:23 -0000 1.16 @@ -288,12 +288,12 @@ } delete tmpStorage; - return new WPXStringStream((const char *)(d->buf), tmpLength); + return new WPXStringStream((d->buf), tmpLength); } -WPXStringStream::WPXStringStream(const char *data, const unsigned int dataSize) : +WPXStringStream::WPXStringStream(const unsigned char *data, const unsigned int dataSize) : WPXInputStream(), - d(new WPXStringStreamPrivate(std::string(data, dataSize))) + d(new WPXStringStreamPrivate(std::string((const char *)data, dataSize))) { d->buffer.seekg( 0, std::ios::end ); d->streamSize = (d->buffer.good() ? (unsigned long)d->buffer.tellg() : (unsigned long)-1L); @@ -426,5 +426,5 @@ } delete tmpStorage; - return new WPXStringStream((const char *)(d->buf), tmpLength); + return new WPXStringStream(d->buf, tmpLength); } Index: WP3ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WP3ContentListener.cpp 29 Oct 2008 19:58:54 -0000 1.40 +++ WP3ContentListener.cpp 7 Nov 2008 17:24:22 -0000 1.41 @@ -28,6 +28,7 @@ #include "WPXFileStructure.h" #include "libwpd_internal.h" #include "WP3SubDocument.h" +#include "WPDocument.h" #include <algorithm> #include <limits> @@ -782,8 +783,8 @@ } } -void WP3ContentListener::insertPicture(float height, float width, uint8_t /* leftColumn */, uint8_t /* rightColumn */, - uint16_t /* figureFlags */, const WPXBinaryData &binaryData) +void WP3ContentListener::insertPicture(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags, const WPXBinaryData &binaryData) { if (!isUndoOn()) { @@ -791,9 +792,7 @@ _openSpan(); WPXPropertyList propList; - propList.insert("svg:width", (float)((double)width/72.0f)); - propList.insert("svg:height", (float)((double)height/72.0f)); - propList.insert("text:anchor-type", "as-char"); + _handleFrameParameters( propList, height, width, verticalOffset, horizontalOffset, leftColumn, rightColumn, figureFlags ); m_documentInterface->openFrame(propList); propList.clear(); @@ -804,8 +803,8 @@ } } -void WP3ContentListener::insertTextBox(float height, float width, uint8_t /* leftColumn */, uint8_t /* rightColumn */, - uint16_t /* figureFlags */, const WP3SubDocument * subDocument, const WP3SubDocument *caption) +void WP3ContentListener::insertTextBox(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags, const WP3SubDocument * subDocument, const WP3SubDocument *caption) { if (!isUndoOn()) { @@ -813,9 +812,7 @@ _openSpan(); WPXPropertyList propList; - propList.insert("svg:width", (float)((double)width/72.0f)); - propList.insert("svg:height", (float)((double)height/72.0f)); - propList.insert("text:anchor-type", "as-char"); + _handleFrameParameters( propList, height, width, verticalOffset, horizontalOffset, leftColumn, rightColumn, figureFlags ); m_documentInterface->openFrame(propList); propList.clear(); @@ -834,8 +831,122 @@ handleSubDocument(caption, WPX_SUBDOCUMENT_TEXT_BOX, m_parseState->m_tableList, 0); m_documentInterface->closeTextBox(); + } - m_documentInterface->closeFrame(); + m_documentInterface->closeFrame(); + } +} + +void WP3ContentListener::insertWP51Table(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags, const WP3SubDocument * subDocument, const WP3SubDocument *caption) +{ + if (!isUndoOn()) + { + if (!m_ps->m_isSpanOpened) + _openSpan(); + + WPXPropertyList propList; + _handleFrameParameters( propList, height, width, verticalOffset, horizontalOffset, leftColumn, rightColumn, figureFlags ); + m_documentInterface->openFrame(propList); + + propList.clear(); + + if (subDocument || caption) + { + WPXPropertyList propList; + m_documentInterface->openTextBox(propList); + + // Positioned objects like text boxes are special beasts. They can contain all hierarchical elements up + // to the level of sections. They cannot open or close a page span though. + if (subDocument) + WPDocument::parseSubDocument(subDocument->getStream(), m_documentInterface, WPD_FILE_FORMAT_WP5); + + if (caption) + handleSubDocument(caption, WPX_SUBDOCUMENT_TEXT_BOX, m_parseState->m_tableList, 0); + + m_documentInterface->closeTextBox(); + } + + m_documentInterface->closeFrame(); + } +} + +void WP3ContentListener::_handleFrameParameters( WPXPropertyList &propList, float height, float width, float verticalOffset, float horizontalOffset, + uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t figureFlags ) +{ + propList.insert("svg:width", (float)((double)width/72.0f)); + propList.insert("svg:height", (float)((double)height/72.0f)); + + if ( ( figureFlags & 0x0300 ) == 0x0000 ) // paragraph + { + propList.insert("text:anchor-type", "paragraph"); + propList.insert("style:vertical-rel", "paragraph" ); + propList.insert("style:vertical-pos", "paragraph" ); + propList.insert("style:horizontal-rel", "paragraph"); + switch ( figureFlags & 0x0003 ) + { + case 0x01: + propList.insert("style:horizontal-pos", "right"); + break; + case 0x02: + propList.insert("style:horizontal-pos", "center"); + break; + case 0x03: + propList.insert("style:horizontal-pos", "center"); + break; + case 0x00: + default: + propList.insert("style:horizontal-pos", "left"); + break; + } + + + } + else if ( ( figureFlags & 0x0300 ) == 0x0100 ) // page + { + propList.insert("text:anchor-type", "char"); + } + else if ( ( figureFlags & 0x0300 ) == 0x0200 ) // character + { + propList.insert("text:anchor-type", "as-char"); + if ( ( figureFlags & 0x1c00 ) == 0x0000 ) + propList.insert( "style:vertical-rel", "baseline" ); + else + propList.insert( "style:vertical-rel", "line" ); + switch ( ( figureFlags & 0x1c00 ) >> 10 ) + { + case 0x01: + if ( verticalOffset == 0.0 ) + propList.insert( "style:vertical-pos", "top" ); + else + { + propList.insert( "style:vertical-pos", "from-top" ); + propList.insert( "svg:y", (float)((double)verticalOffset/72.0f)); + } + break; + case 0x02: + if ( verticalOffset == 0.0 ) + propList.insert( "style:vertical-pos", "middle" ); + else + { + propList.insert( "style:vertical-pos", "from-top" ); + propList.insert( "svg:y", (float)((double)verticalOffset/72.0f - (double)height/(2.0f*72.0f))); + } + break; + case 0x00: + case 0x03: + if ( verticalOffset == 0.0 ) + propList.insert( "style:vertical-pos", "bottom" ); + else + { + propList.insert( "style:vertical-pos", "from-top" ); + propList.insert( "svg:y", (float)((double)verticalOffset/72.0f - (double)height/72.0f)); + } + break; + case 0x04: + break; + default: + break; } } } Index: WPXMemoryStream.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXMemoryStream.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WPXMemoryStream.h 9 Nov 2007 16:02:41 -0000 1.11 +++ WPXMemoryStream.h 7 Nov 2008 17:24:23 -0000 1.12 @@ -39,6 +39,7 @@ virtual int seek(long offset, WPX_SEEK_TYPE seekType); virtual long tell(); virtual bool atEOS(); + virtual size_t getSize() const { return m_size; }; private: long m_offset; Index: WPXStreamImplementation.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXStreamImplementation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WPXStreamImplementation.h 19 Oct 2007 13:13:59 -0000 1.4 +++ WPXStreamImplementation.h 7 Nov 2008 17:24:23 -0000 1.5 @@ -51,7 +51,7 @@ class WPXStringStream: public WPXInputStream { public: - WPXStringStream(const char *data, const unsigned int dataSize); + WPXStringStream(const unsigned char *data, const unsigned int dataSize); ~WPXStringStream(); const unsigned char *read(size_t numBytes, size_t &numBytesRead); Index: WP3Listener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3Listener.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- WP3Listener.h 27 Oct 2008 13:06:49 -0000 1.26 +++ WP3Listener.h 7 Nov 2008 17:24:23 -0000 1.27 @@ -82,9 +82,11 @@ virtual void leftIndent(float offset) = 0; virtual void leftRightIndent() = 0; virtual void leftRightIndent(float offset) = 0; - virtual void insertPicture(float height, float width, uint8_t leftColumn, uint8_t rightColumn, + virtual void insertPicture(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, uint16_t figureFlags, const WPXBinaryData &binaryData) = 0; - virtual void insertTextBox(float height, float width, uint8_t leftColumn, uint8_t rightColumn, + virtual void insertTextBox(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, + uint16_t figureFlags, const WP3SubDocument *subDocument, const WP3SubDocument *caption) = 0; + virtual void insertWP51Table(float height, float width, float verticalOffset, float horizontalOffset, uint8_t leftColumn, uint8_t rightColumn, uint16_t figureFlags, const WP3SubDocument *subDocument, const WP3SubDocument *caption) = 0; void setResourceFork(WP3ResourceFork *resourceFork) { m_resourceFork = resourceFork; } |
|
From: Fridrich S. <str...@us...> - 2008-11-07 06:35:30
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/java In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17482/src/java Modified Files: Makefile.am Log Message: fixing a typo Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/java/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile.am 7 Nov 2008 05:12:51 -0000 1.17 +++ Makefile.am 7 Nov 2008 06:35:24 -0000 1.18 @@ -76,7 +76,7 @@ wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar: org/libwpd/wpd.class @JAR@ -cf wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar org/libwpd/*.class -nstall-exec-local: install-jar +install-exec-local: install-jar install-jar: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.jar mkdir -p $(DESTDIR)$(prefix)/share/java |
|
From: Fridrich S. <str...@us...> - 2008-11-07 05:13:04
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13384/src/csharp/examples Modified Files: Makefile.am Log Message: add resource file for win32 version of the sharp glue library + fix make distcheck Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/examples/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 6 Nov 2008 04:55:20 -0000 1.3 +++ Makefile.am 7 Nov 2008 05:12:51 -0000 1.4 @@ -1,11 +1,13 @@ EXTRA_DIST = wpd2raw.cs RawListenerImpl.cs +all: + wpd2raw.exe: @GMCS@ \ -unsafe \ -out:$@ \ - -r:../wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ - wpd2raw.cs RawListenerImpl.cs + -r:$(top_builddir)/src/csharp/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll \ + $(top_srcdir)/src/csharp/examples/wpd2raw.cs $(top_srcdir)/src/csharp/examples/RawListenerImpl.cs check: wpd2raw.exe @@ -15,5 +17,6 @@ clean: clean-local distclean-local: clean-local + rm -f Makefile distclean: distclean-local |
|
From: Fridrich S. <str...@us...> - 2008-11-07 05:13:00
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13384 Modified Files: configure.in Log Message: add resource file for win32 version of the sharp glue library + fix make distcheck Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- configure.in 6 Nov 2008 19:56:49 -0000 1.14 +++ configure.in 7 Nov 2008 05:12:51 -0000 1.15 @@ -84,18 +84,18 @@ native_win32=yes AC_CHECK_TOOL(WINDRES, windres) WPDJAVA_WIN32_RESOURCE=libwpd-java-win32res.lo - WPDCSHARP_WIN32_RESOURCE=libwpd-csharp-win32res.lo + WPDSHARP_WIN32_RESOURCE=libwpd-sharp-win32res.lo ;; *) native_win32=no WPDJAVA_WIN32_RESOURCE= - WPDCSHARP_WIN32_RESOURCE= + WPDSHARP_WIN32_RESOURCE= ;; esac AC_MSG_RESULT([$native_win32]) AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes) AC_SUBST(WPDJAVA_WIN32_RESOURCE) -AC_SUBST(WPDCSHARP_WIN32_RESOURCE) +AC_SUBST(WPDSHARP_WIN32_RESOURCE) AC_MSG_CHECKING([for Win32 platform in general]) case "$host" in @@ -186,6 +186,7 @@ src/csharp/test.sh src/csharp/wpd-0.9.dll.config src/csharp/libwpd-sharp-0.9.pc +src/csharp/libwpd-sharp.rc src/csharp/Makefile src/csharp/examples/Makefile src/java/test.sh |
|
From: Fridrich S. <str...@us...> - 2008-11-07 05:12:59
|
Update of /cvsroot/libwpd/libwpd2-bindings/src/csharp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13384/src/csharp Modified Files: Makefile.am Added Files: libwpd-sharp.rc.in Log Message: add resource file for win32 version of the sharp glue library + fix make distcheck --- NEW FILE: libwpd-sharp.rc.in --- #include <winver.h> VS_VERSION_INFO VERSIONINFO FILEVERSION @WPDBINDINGS_MAJOR_VERSION@,@WPDBINDINGS_MINOR_VERSION@,@WPDBINDINGS_MICRO_VERSION@,BUILDNUMBER PRODUCTVERSION @WPDBINDINGS_MAJOR_VERSION@,@WPDBINDINGS_MINOR_VERSION@,@WPDBINDINGS_MICRO_VERSION@,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 FILETYPE VFT_DLL FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904B0" BEGIN VALUE "CompanyName", "The libwpd developer community" VALUE "FileDescription", "libwpd-sharp" VALUE "FileVersion", "@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.@WPDBINDINGS_MICRO_VERSION@.BUILDNUMBER" VALUE "InternalName", "libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@" VALUE "LegalCopyright", "Copyright (C) 2008 Miklos Vajna, Fridrich Strba, other contributers" VALUE "OriginalFilename", "libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll" VALUE "ProductName", "libwpd-bindings" VALUE "ProductVersion", "@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.@WPDBINDINGS_MICRO_VERSION@" END END BLOCK "VarFileInfo" BEGIN VALUE "Translation", 0x409, 1200 END END Index: Makefile.am =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/src/csharp/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 6 Nov 2008 19:56:49 -0000 1.9 +++ Makefile.am 7 Nov 2008 05:12:51 -0000 1.10 @@ -23,6 +23,10 @@ uninstall-libtool-import-lib: -rm $(DESTDIR)$(libdir)/libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.a +@WPDSHARP_WIN32_RESOURCE@ : libwpd-sharp.rc $(libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_OBJECTS) + chmod +x $(top_srcdir)/build/win32/*compile-resource && \ + WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource libwpd-sharp.rc @WPDSHARP_WIN32_RESOURCE@ + else version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -avoid-version install-libtool-import-lib: @@ -36,7 +40,8 @@ AM_CXXFLAGS = $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LIBADD = $(WPDBINDINGS_LIBS) +libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_LIBADD = $(WPDBINDINGS_LIBS) @WPDSHARP_WIN32_RESOURCE@ +libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_DEPENDENCIES = @WPDSHARP_WIN32_RESOURCE@ nodist_libwpd_sharp_@WPDBINDINGS_MAJOR_VERSION@_@WPDBINDINGS_MINOR_VERSION@_la_SOURCES = wpd_sharp_wrap.cxx wpd_sharp_wrap.hxx top_srcdir = @top_srcdir@ @@ -46,11 +51,13 @@ CXXFLAGS += $(WPDBINDINGS_CXXFLAGS) $(DEBUG_CXXFLAGS) LDFLAGS += $(WPDBINDINGS_LIBS) -sharp_SWIG = SWIGTYPE_p_size_t.cs SWIGTYPE_p_unsigned_char.cs SWIGTYPE_p_WPXEncryption.cs WPDConfidence.cs wpd.cs \ +SHARP_SWIG = SWIGTYPE_p_size_t.cs SWIGTYPE_p_unsigned_char.cs SWIGTYPE_p_WPXEncryption.cs WPDConfidence.cs wpd.cs \ WPDFileFormat.cs WPDocument.cs WPDPasswordMatch.cs wpdPINVOKE.cs WPDResult.cs WPXBinaryData.cs \ WPXDocumentInterface.cs WPXFileStream.cs WPXInputStream.cs WPXProperty.cs WPXPropertyFactory.cs \ WPXPropertyList.cs WPXPropertyList_Iter.cs WPXPropertyListVector.cs WPXPropertyListVector_Iter.cs \ WPX_SEEK_TYPE.cs WPXString.cs WPXStringStream.cs WPXUnit.cs + +SHARP_NOSWIG = WPDocumentCSharp.cs WPXDocumentCSharpInterface.cs WPXDocumentInterfaceProxy.cs EXTRA_DIST = \ WPDocumentCSharp.cs \ @@ -58,18 +65,23 @@ WPXDocumentInterfaceProxy.cs \ assembly.cs.in \ wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.keys \ - wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.config + wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll.config \ libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.pc.in all: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll: libwpd-sharp-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.la + for i in $(SHARP_SWIG); do \ + SHARP_FILES="$$SHARP_FILES $(top_builddir)/src/csharp/$$i"; done && \ + for j in $(SHARP_NOSWIG); do \ + SHARP_FILES="$$SHARP_FILES $(top_srcdir)/src/csharp/$$j"; done && \ + SHARP_FILES="$$SHARP_FILES $(top_builddir)/src/csharp/assembly.cs" && \ @GMCS@ \ -target:library \ -unsafe \ - -keyfile:wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.keys \ + -keyfile:$(top_srcdir)/src/csharp/wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.keys \ -out:$@ \ - *.cs + $$SHARP_FILES install-exec-local: wpd-@WPDBINDINGS_MAJOR_VERSION@.@WPDBINDINGS_MINOR_VERSION@.dll mkdir -p $(DESTDIR)$(libdir)/mono/gac $(DESTDIR)$(libdir)/mono/libwpd @@ -97,8 +109,8 @@ $(top_srcdir)/src/wpd.i clean-local: - for i in $(sharp_SWIG); do rm -f $$i; done + for i in $(SHARP_SWIG); do rm -f $$i; done rm -f *.hxx *.cxx *.h *.i *.dll -distclean-local: clean +distclean-local: rm -f Makefile |
1 message has been excluded from this view by a project administrator.
