upload libmwaw 0.3.8

Change-Id: I4779d538199ecccb8997e3bfdbf97d7b0ea9679b

4 files changed, 65 insertions, 58 deletions

diff --git a/external/libmwaw/0001-fix-build-with-msvc.patch.1 b/external/libmwaw/0001-fix-build-with-msvc.patch.1
new file mode 100644
index 000000000000..95b5e0cbeb0b
--- /dev/null
+++ b/external/libmwaw/0001-fix-build-with-msvc.patch.1
@@ -0,0 +1,54 @@
+From 01495bf788fe32723f222599e34ba1779ca3d594 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Fri, 24 Jun 2016 14:01:14 +0200
+Subject: [PATCH] fix build with msvc
+
+---
+ src/lib/CricketDrawParser.cxx | 4 ++--
+ src/lib/FreeHandParser.cxx    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/CricketDrawParser.cxx b/src/lib/CricketDrawParser.cxx
+index f04be91..9fe5a32 100644
+--- a/src/lib/CricketDrawParser.cxx
++++ b/src/lib/CricketDrawParser.cxx
+@@ -930,12 +930,12 @@ bool CricketDrawParser::readShape()
+         MWAWBox2f box(shape.m_vertices[0], shape.m_vertices[2]);
+         int angle[2] = { shape.m_angles[0], shape.m_angles[1] };
+         if (box.min()[1]>box.max()[1]) {
+-          std::swap<float>(box.min()[1],box.max()[1]);
++          std::swap(box.min()[1],box.max()[1]);
+           angle[0]=180-shape.m_angles[1];
+           angle[1]=180-shape.m_angles[0];
+         }
+         if (angle[1]<=angle[0])
+-          std::swap<int>(angle[0],angle[1]);
++          std::swap(angle[0],angle[1]);
+         if (angle[1]>360) {
+           int numLoop=int(angle[1]/360)-1;
+           angle[0]-=numLoop*360;
+diff --git a/src/lib/FreeHandParser.cxx b/src/lib/FreeHandParser.cxx
+index 78d8b08..e97e6e3 100644
+--- a/src/lib/FreeHandParser.cxx
++++ b/src/lib/FreeHandParser.cxx
+@@ -999,7 +999,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool strict)
+         getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
+         for (int j=0; j<4; ++j) {
+           if (j==1) continue;
+-          std::swap<float>(dim[2*j],dim[2*j+1]);
++          std::swap(dim[2*j],dim[2*j+1]);
+         }
+         val &= 0xFFDF;
+       }
+@@ -1016,7 +1016,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool strict)
+           f << "landscape,";
+           getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
+           for (int j=0; j<4; ++j)
+-            std::swap<float>(dim[2*j],dim[2*j+1]);
++            std::swap(dim[2*j],dim[2*j+1]);
+         }
+         if (val&2) f << "crop[mark],";
+         if (val&4) f << "center[mark],";
+-- 
+2.7.4
+
diff --git a/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 b/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
deleted file mode 100644
index b9ed2e11c3cc..000000000000
--- a/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d178367e7029a98fb555a084c1c946c8826ff06 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 24 Nov 2015 15:15:36 +0100
-Subject: [PATCH] if ptr to member var. is defined, ensure the class is
- complete
-
-... because MSVC represents pointers to member as variable size,
-depending on context (e.g., multiple inheritance). So it can happen that
-the size of the pointer in the header (where the class is only
-forward-declared) differs from the size of the same pointer in an impl.
-file (where the class is complete).
----
- src/lib/ClarisWksDocument.hxx | 1 +
- src/lib/GreatWksDocument.hxx  | 1 +
- src/lib/MsWksDocument.hxx     | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/lib/ClarisWksDocument.hxx b/src/lib/ClarisWksDocument.hxx
-index 2b70860..3003b6a 100644
---- a/src/lib/ClarisWksDocument.hxx
-+++ b/src/lib/ClarisWksDocument.hxx
-@@ -42,6 +42,7 @@
- 
- #include "libmwaw_internal.hxx"
- 
-+#include "MWAWParser.hxx"
- #include "MWAWPosition.hxx"
- 
- #include "ClarisWksStruct.hxx"
-diff --git a/src/lib/GreatWksDocument.hxx b/src/lib/GreatWksDocument.hxx
-index 2e00451..2e13dc2 100644
---- a/src/lib/GreatWksDocument.hxx
-+++ b/src/lib/GreatWksDocument.hxx
-@@ -41,6 +41,7 @@
- 
- #include "MWAWCell.hxx"
- #include "MWAWDebug.hxx"
-+#include "MWAWParser.hxx"
- 
- namespace GreatWksDocumentInternal
- {
-diff --git a/src/lib/MsWksDocument.hxx b/src/lib/MsWksDocument.hxx
-index a212e7f..e96f5dd 100644
---- a/src/lib/MsWksDocument.hxx
-+++ b/src/lib/MsWksDocument.hxx
-@@ -44,6 +44,7 @@
- 
- #include "MWAWDebug.hxx"
- #include "MWAWCell.hxx"
-+#include "MWAWParser.hxx"
- 
- namespace MsWksDocumentInternal
- {
--- 
-2.5.0
-
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 072d4bd0aee6..c28fe0117c2f 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -58,9 +58,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/ClarisWksStyleManager \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksTable \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksText \
+	UnpackedTarball/libmwaw/src/lib/CricketDrawParser \
 	UnpackedTarball/libmwaw/src/lib/DocMkrParser \
 	UnpackedTarball/libmwaw/src/lib/DocMkrText \
 	UnpackedTarball/libmwaw/src/lib/EDocParser \
+	UnpackedTarball/libmwaw/src/lib/FreeHandParser \
 	UnpackedTarball/libmwaw/src/lib/FullWrtGraph \
 	UnpackedTarball/libmwaw/src/lib/FullWrtParser \
 	UnpackedTarball/libmwaw/src/lib/FullWrtStruct \
@@ -86,6 +88,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MWAWChart \
 	UnpackedTarball/libmwaw/src/lib/MWAWDebug \
 	UnpackedTarball/libmwaw/src/lib/MWAWDocument \
+	UnpackedTarball/libmwaw/src/lib/MWAWEntry \
 	UnpackedTarball/libmwaw/src/lib/MWAWFont \
 	UnpackedTarball/libmwaw/src/lib/MWAWFontConverter \
 	UnpackedTarball/libmwaw/src/lib/MWAWFontSJISConverter \
@@ -97,13 +100,16 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MWAWHeader \
 	UnpackedTarball/libmwaw/src/lib/MWAWInputStream \
 	UnpackedTarball/libmwaw/src/lib/MWAWList \
+	UnpackedTarball/libmwaw/src/lib/MWAWListener \
 	UnpackedTarball/libmwaw/src/lib/MWAWOLEParser \
 	UnpackedTarball/libmwaw/src/lib/MWAWPageSpan \
 	UnpackedTarball/libmwaw/src/lib/MWAWParagraph \
 	UnpackedTarball/libmwaw/src/lib/MWAWParser \
+	UnpackedTarball/libmwaw/src/lib/MWAWPict \
 	UnpackedTarball/libmwaw/src/lib/MWAWPictBitmap \
 	UnpackedTarball/libmwaw/src/lib/MWAWPictData \
 	UnpackedTarball/libmwaw/src/lib/MWAWPictMac \
+	UnpackedTarball/libmwaw/src/lib/MWAWPosition \
 	UnpackedTarball/libmwaw/src/lib/MWAWPresentationListener \
 	UnpackedTarball/libmwaw/src/lib/MWAWPrinter \
 	UnpackedTarball/libmwaw/src/lib/MWAWPropertyHandler \
@@ -127,12 +133,14 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MacWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MacWrtProParser \
 	UnpackedTarball/libmwaw/src/lib/MacWrtProStructures \
+	UnpackedTarball/libmwaw/src/lib/MaxWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MarinerWrtGraph \
 	UnpackedTarball/libmwaw/src/lib/MarinerWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MarinerWrtText \
 	UnpackedTarball/libmwaw/src/lib/MindWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MoreParser \
 	UnpackedTarball/libmwaw/src/lib/MoreText \
+	UnpackedTarball/libmwaw/src/lib/MouseWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MsWks3Text \
 	UnpackedTarball/libmwaw/src/lib/MsWks4Text \
 	UnpackedTarball/libmwaw/src/lib/MsWks4Zone \
@@ -171,6 +179,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
 	UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
 	UnpackedTarball/libmwaw/src/lib/WingzParser \
+	UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
 	UnpackedTarball/libmwaw/src/lib/WriteNowParser \
 	UnpackedTarball/libmwaw/src/lib/WriteNowText \
 	UnpackedTarball/libmwaw/src/lib/WriterPlsParser \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 2adf7ffad639..17c3ec5f82c2 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -35,8 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-	external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+	external/libmwaw/0001-fix-build-with-msvc.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: