[Libreoffice-commits] core.git: external/libmwaw

[Michael Stahl]

 external/libmwaw/UnpackedTarball_libmwaw.mk         |    1 +
 external/libmwaw/libmwaw-fix-compare-assert.patch.1 |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 3510a0e2245e619a2e2518f8702686d608522cdf
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Apr 6 14:27:31 2017 +0200

    libmwaw: fix MSVC2017 "invalid comparator" assert
    
    Change-Id: Ic1ace8da86d6306d1cc3d3b124a236bf794cc7be

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index ce283807e490..de99d5685378 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ 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 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw-fix-compare-assert.patch.1 b/external/libmwaw/libmwaw-fix-compare-assert.patch.1
new file mode 100755
index 000000000000..d7dae34a90bb
--- /dev/null
+++ b/external/libmwaw/libmwaw-fix-compare-assert.patch.1
@@ -0,0 +1,13 @@
+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;