upload libwps 0.4.0

Change-Id: I9da61333b7c46d20cf7010553929b141ec011d84

6 files changed, 80 insertions, 4 deletions

diff --git a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch b/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch
new file mode 100644
index 000000000000..d5a6f5473d40
--- /dev/null
+++ b/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch
@@ -0,0 +1,26 @@
+From 45a3dd5393e07340d5a63d8a8735789d73a61b17 Mon Sep 17 00:00:00 2001
+From: osnola <alonso@loria.fr>
+Date: Mon, 18 May 2015 08:27:59 +0200
+Subject: [PATCH] QuattroPro parser: correct a mistake when reading negative
+ cell's position
+
+---
+ src/lib/QuattroSpreadsheet.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
+index cb0f4f5..ce5e20a 100644
+--- a/src/lib/QuattroSpreadsheet.cpp
++++ b/src/lib/QuattroSpreadsheet.cpp
+@@ -1668,7 +1668,7 @@ bool QuattroSpreadsheet::readCell
+ 			else
+ 			{
+ 				val &= 0x3FFF;
+-				if (val & 0x2000) val = val - 0x4000;
++				if (val>0x1000) val = val - 0x2000;
+ 			}
+ 			if (dim==2)
+ 				val += sheetId;
+-- 
+2.3.2 (Apple Git-55)
+
diff --git a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch b/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch
new file mode 100644
index 000000000000..01109dc72215
--- /dev/null
+++ b/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch
@@ -0,0 +1,35 @@
+From 94af34d42129bad72fd7ce50dc6901287509703e Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 18 May 2015 18:50:25 +0200
+Subject: [PATCH] error C2065: M_PI : undeclared identifier
+
+---
+ src/lib/libwps_internal.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
+index fb9016d..02a87bc 100644
+--- a/src/lib/libwps_internal.h
++++ b/src/lib/libwps_internal.h
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #endif
+ 
++#include <cmath>
+ #include <iostream>
+ #include <map>
+ #include <string>
+@@ -36,6 +37,10 @@
+ #include <librevenge-stream/librevenge-stream.h>
+ #include <librevenge/librevenge.h>
+ 
++#ifndef M_PI
++#define M_PI 3.14159265358979323846
++#endif
++
+ #if defined(_MSC_VER) || defined(__DJGPP__)
+ typedef signed char int8_t;
+ typedef unsigned char uint8_t;
+-- 
+2.4.0
+
diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk
index 3e0f79bbdb1f..f37dc316cdf7 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
 $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.3.dylib,src/lib/.libs/libwps-0.3.3.dylib))
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4.dylib,src/lib/.libs/libwps-0.4.4.dylib))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.dll,src/lib/.libs/libwps-0.3.dll))
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.so.3,src/lib/.libs/libwps-0.3.so.3.0.1))
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index be54d7bfb216..42cf8a41fe5f 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),\
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \
 		) \
 	)
 
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index be9f3c663c27..ef323cebb7bf 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_add_defs,wps,\
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
 
 $(eval $(call gb_Library_add_generated_exception_objects,wps,\
+	UnpackedTarball/libwps/src/lib/Lotus \
+	UnpackedTarball/libwps/src/lib/LotusGraph \
+	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
+	UnpackedTarball/libwps/src/lib/LotusStyleManager \
+	UnpackedTarball/libwps/src/lib/Quattro \
+	UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
 	UnpackedTarball/libwps/src/lib/WKS4 \
 	UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \
 	UnpackedTarball/libwps/src/lib/WKSContentListener \
@@ -52,6 +58,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
 	UnpackedTarball/libwps/src/lib/WPSDebug \
 	UnpackedTarball/libwps/src/lib/WPSDocument \
 	UnpackedTarball/libwps/src/lib/WPSFont \
+	UnpackedTarball/libwps/src/lib/WPSGraphicShape \
+	UnpackedTarball/libwps/src/lib/WPSGraphicStyle \
 	UnpackedTarball/libwps/src/lib/WPSHeader \
 	UnpackedTarball/libwps/src/lib/WPSList \
 	UnpackedTarball/libwps/src/lib/WPSOLEParser \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 1fd633acbe90..77662a7944f2 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -11,4 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libwps))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+	external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \
+	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \
+))
+
 # vim: set noet sw=4 ts=4: