summaryrefslogtreecommitdiff
path: root/external/libstaroffice
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2018-04-26 08:41:52 +0200
committerDavid Tardon <dtardon@redhat.com>2018-04-26 22:10:41 +0200
commit488f70e0c5209fd092b67252fdebb784efa04673 (patch)
treee93f1a6ee961add5f8e21d735a4185788744559e /external/libstaroffice
parentd482ecdfcf3b30fece662270cc1a8ea5c24cb226 (diff)
upload libstaroffice 0.0.6
Change-Id: Id3a845174e7cebad999895bc57e2d05f36f3d597 Reviewed-on: https://gerrit.libreoffice.org/53499 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libstaroffice')
-rw-r--r--external/libstaroffice/0001-add-missing-include-for-std-max.patch.124
-rw-r--r--external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.135
-rw-r--r--external/libstaroffice/Library_staroffice.mk2
-rw-r--r--external/libstaroffice/UnpackedTarball_libstaroffice.mk4
4 files changed, 28 insertions, 37 deletions
diff --git a/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
new file mode 100644
index 000000000000..2445d2a4a8e3
--- /dev/null
+++ b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
@@ -0,0 +1,24 @@
+From d6c34e98a6adb060ad42b9f1c60a1e8036bc27ff Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 26 Apr 2018 14:21:06 +0200
+Subject: [PATCH] add missing include for std::max
+
+---
+ src/lib/STOFFChart.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx
+index cd1566f..3e7310c 100644
+--- a/src/lib/STOFFChart.cxx
++++ b/src/lib/STOFFChart.cxx
+@@ -37,6 +37,7 @@
+ *
+ */
+
++#include <algorithm>
+ #include <iomanip>
+ #include <iostream>
+ #include <map>
+--
+2.14.3
+
diff --git a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 b/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
deleted file mode 100644
index 658f6797940d..000000000000
--- a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 59f29dd735bf5890ea29fdde809afcf111463a65 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 12 Mar 2018 20:33:54 +0100
-Subject: [PATCH] fix null ptr deref. if decryption failed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
----
- src/lib/StarObjectDraw.cxx | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
-index fd3411a..8a19b1c 100644
---- a/src/lib/StarObjectDraw.cxx
-+++ b/src/lib/StarObjectDraw.cxx
-@@ -199,10 +199,11 @@ try
- if the user mask does correspond to the real mask.
- */
- input=StarEncryption::decodeStream(input, StarEncryption::getMaskToDecodeStream(firstByte, 0x44));
-- if (input) {
-- zone.setInput(input);
-- input->seek(0, librevenge::RVNG_SEEK_SET);
-+ if (!input) {
-+ STOFF_DEBUG_MSG(("StarObjectDraw::readDrawDocument: decryption failed\n"));
-+ return false;
- }
-+ zone.setInput(input);
- }
- input->seek(0, librevenge::RVNG_SEEK_SET);
- std::shared_ptr<StarObjectModel> model(new StarObjectModel(*this, true));
---
-2.14.3
-
diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk
index afa8a032518f..6ff99fb46eb1 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetDecoder \
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetEncoder \
UnpackedTarball/libstaroffice/src/lib/STOFFSpreadsheetListener \
+ UnpackedTarball/libstaroffice/src/lib/STOFFStarMathToMMLConverter \
UnpackedTarball/libstaroffice/src/lib/STOFFStringStream \
UnpackedTarball/libstaroffice/src/lib/STOFFSubDocument \
UnpackedTarball/libstaroffice/src/lib/STOFFTable \
@@ -92,6 +93,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,staroffice,\
UnpackedTarball/libstaroffice/src/lib/StarObject \
UnpackedTarball/libstaroffice/src/lib/StarObjectChart \
UnpackedTarball/libstaroffice/src/lib/StarObjectDraw \
+ UnpackedTarball/libstaroffice/src/lib/StarObjectMath \
UnpackedTarball/libstaroffice/src/lib/StarObjectModel \
UnpackedTarball/libstaroffice/src/lib/StarObjectNumericRuler \
UnpackedTarball/libstaroffice/src/lib/StarObjectPageStyle \
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 781634ab9fb3..fdf668d196dc 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
))
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \
- external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice,\
+ external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 \
))
# vim: set noet sw=4 ts=4: