upload libmwaw 0.3.12

Change-Id: Ie1daeb0b637649cbb7eda923495949a6d9e84102
Reviewed-on: https://gerrit.libreoffice.org/40036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>

4 files changed, 0 insertions, 69 deletions

diff --git a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
deleted file mode 100644
index 881fb92752fa..000000000000
--- a/external/libmwaw/0001-fix-build-with-MSVC.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3d7479236e565c974a1f6e04d6cd1139bca5cb58 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 31 Jan 2017 14:49:05 +0100
-Subject: [PATCH] fix build with MSVC
-
----
- src/lib/PowerPoint1Parser.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/PowerPoint1Parser.cxx b/src/lib/PowerPoint1Parser.cxx
-index 2f735dc..e57eb65 100644
---- a/src/lib/PowerPoint1Parser.cxx
-+++ b/src/lib/PowerPoint1Parser.cxx
-@@ -807,7 +807,7 @@ bool PowerPoint1Parser::readFramesList(MWAWEntry const &entry, std::vector<Power
-         if (schemeId>=0 && !getColor(col, schemeId, colors[i])) f << "##col,";
-         if (col!=expected[i]) f << "col" << i << "=" << col << ",";
-       }
--      if (!isMacFile) std::swap<MWAWColor>(colors[1],colors[3]);
-+      if (!isMacFile) std::swap(colors[1],colors[3]);
-     }
-     MWAWGraphicStyle &style=frame.m_style;
-     val=int(input->readULong(1));
--- 
-2.9.3
-
diff --git a/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
deleted file mode 100644
index df64f7bcf4d2..000000000000
--- a/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 8 Apr 2017 14:03:29 +0200
-Subject: [PATCH] ofz#1037 resize vector correctly
-
----
- src/lib/MsWrd1Parser.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
-index 63547e6..3626064 100644
---- a/src/lib/MsWrd1Parser.cxx
-+++ b/src/lib/MsWrd1Parser.cxx
-@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
-     int id = fIt++->second;
-     fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
-     if (id >= int(m_state->m_footnotesList.size()))
--      m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
-+      m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
-     m_state->m_footnotesList[size_t(id)]=fPos;
-   }
-   ascii().addDelimiter(input->tell(),'|');
--- 
-2.13.0
-
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 9fa7f0bfdab9..c51473a3fe82 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -35,12 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
-	external/libmwaw/0001-fix-build-with-MSVC.patch.1 \
-	external/libmwaw/libmwaw-fix-compare-assert.patch.1 \
-	external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 \
-))
-
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
     external/libmwaw/iOS.patch.0 \
 ))
diff --git a/external/libmwaw/libmwaw-fix-compare-assert.patch.1 b/external/libmwaw/libmwaw-fix-compare-assert.patch.1
deleted file mode 100755
index d7dae34a90bb..000000000000
--- a/external/libmwaw/libmwaw-fix-compare-assert.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
-Assertion failed: invalid comparator
-
---- libmwaw/src/lib/MWAWFont.hxx.orig	2017-04-06 14:19:52.751000000 +0200
-+++ libmwaw/src/lib/MWAWFont.hxx	2017-04-06 13:50:51.385400000 +0200
-@@ -505,7 +505,7 @@
-     int diff = id() - oth.id();
-     if (diff != 0) return diff;
-     if (size() < oth.size()) return -1;
--    if (size() > oth.size()) return -1;
-+    if (size() > oth.size()) return 1;
-     if (m_sizeIsRelative.get() != oth.m_sizeIsRelative.get()) return m_sizeIsRelative.get() ? 1 : -1;
-     if (flags() < oth.flags()) return -1;
-     if (flags() > oth.flags()) return 1;