summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2018-04-25 07:02:54 +0200
committerDavid Tardon <dtardon@redhat.com>2018-04-26 10:42:02 +0200
commit9739749ba8da87001b73027136f120ef532f0b2b (patch)
treea615720b6026401fe0c4486e2f6d892ff286f5c3 /external
parent3b90faa9c51791d01bef69ac6924a71e869f25d7 (diff)
upload libwps 0.4.9
Change-Id: I9571d91d6ce81d7e8752f24c3220f858a5303986 Reviewed-on: https://gerrit.libreoffice.org/53431 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.127
-rw-r--r--external/libwps/0001-drop-unneeded-include.patch.124
-rw-r--r--external/libwps/Library_wps.mk1
-rw-r--r--external/libwps/UnpackedTarball_libwps.mk5
4 files changed, 1 insertions, 56 deletions
diff --git a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1 b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
deleted file mode 100644
index 40c929ab8ea0..000000000000
--- a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2a3465442d1305c7fec55e986c9793a86e571baa Mon Sep 17 00:00:00 2001
-From: osnola <alonso@loria.fr>
-Date: Fri, 24 Nov 2017 12:32:30 +0100
-Subject: [PATCH] Lotus .123: do no assume that a file containing a fdc's
- structure is a Mac file :-~
-
----
- src/lib/Lotus.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/lib/Lotus.cpp b/src/lib/Lotus.cpp
-index d145014..514faad 100644
---- a/src/lib/Lotus.cpp
-+++ b/src/lib/Lotus.cpp
-@@ -3046,8 +3046,7 @@ bool LotusParser::readMacFontName(std::shared_ptr<WPSStream> stream, long endPos
- }
- else if (nameOk && !name.empty())
- {
-- auto encoding=name!="Symbol" ? libwps_tools_win::Font::MAC_ROMAN : libwps_tools_win::Font::MAC_SYMBOL;
-- LotusParserInternal::Font font(encoding);
-+ LotusParserInternal::Font font(getDefaultFontType());
- font.m_name=name;
- m_state->m_fontsMap.insert(std::map<int, LotusParserInternal::Font>::value_type(id,font));
- }
---
-2.14.3
-
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 b/external/libwps/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 4d7b5a494530..000000000000
--- a/external/libwps/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 27 Nov 2017 19:32:53 +0100
-Subject: [PATCH] drop unneeded include
-
----
- src/lib/QuattroSpreadsheet.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
-index 8d7e1c0..bc35bdf 100644
---- a/src/lib/QuattroSpreadsheet.cpp
-+++ b/src/lib/QuattroSpreadsheet.cpp
-@@ -21,7 +21,6 @@
-
- #include <stdlib.h>
- #include <string.h>
--#include <strings.h>
-
- #include <algorithm>
- #include <cctype>
---
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index d1525ecdeb11..4c2cf0e3b1d0 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
+ UnpackedTarball/libwps/src/lib/Multiplan \
UnpackedTarball/libwps/src/lib/Quattro \
UnpackedTarball/libwps/src/lib/QuattroDos \
UnpackedTarball/libwps/src/lib/QuattroDosChart \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 742392b2b346..d712f25406bd 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,9 +35,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
- external/libwps/0001-drop-unneeded-include.patch.1 \
- external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1 \
-))
-
# vim: set noet sw=4 ts=4: