[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/libmwaw

[David Tardon]

 external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 |   56 ++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk                                        |    4 
 2 files changed, 60 insertions(+)

New commits:
commit 2dab392c3b72b728245d96ab82f6f591af980efe
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Nov 24 15:33:20 2015 +0100

    fix c++ snafu with msvc
    
    (cherry picked from commit b1e5983f04095346bee48dc3b413c0ae28789c27)
    
    Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150
    Reviewed-on: https://gerrit.libreoffice.org/20156
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

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
new file mode 100644
index 0000000..b9ed2e1
--- /dev/null
+++ b/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
@@ -0,0 +1,56 @@
+From 2d178367e7029a98fb555a084c1c946c8826ff06 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at 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/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 7751b38..406af42 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -35,4 +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 \
+))
+
 # vim: set noet sw=4 ts=4: