[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa
David Tardon
dtardon at redhat.com
Wed Apr 25 15:49:29 UTC 2018
configure.ac | 2
download.lst | 4
external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 | 25 -----
external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 | 27 ++++++
external/libmwaw/Library_mwaw.mk | 2
external/libmwaw/UnpackedTarball_libmwaw.mk | 4
solenv/flatpak-manifest.in | 6 -
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 5 -
writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx | 46 +++++++++++
9 files changed, 87 insertions(+), 34 deletions(-)
New commits:
commit e24f6397e34a6bb02dfb80316060f11e7f179263
Author: David Tardon <dtardon at redhat.com>
Date: Tue Apr 24 17:25:07 2018 +0200
upload libmwaw 0.3.14
Change-Id: I727171251964eaf7a14595abaaa2d08fb783258c
Reviewed-on: https://gerrit.libreoffice.org/53419
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index 7ccc9f1997c6..c3b24edee347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7862,7 +7862,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.14])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 3e9e1be3aa15..897a6c83498e 100644
--- a/download.lst
+++ b/download.lst
@@ -170,8 +170,8 @@ export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09
export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
-export MWAW_VERSION_MICRO := 13
+export MWAW_SHA256SUM := aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
+export MWAW_VERSION_MICRO := 14
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
export MYSQL_CONNECTOR_CPP_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
export MYSQL_CONNECTOR_CPP_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
deleted file mode 100644
index 2036fa869f86..000000000000
--- a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Wed, 15 Nov 2017 13:15:44 +0100
-Subject: [PATCH] fix call of explicit ctor
-
----
- src/lib/libmwaw_internal.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
---- a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
- }
- //! generic constructor
- template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
-- : m_data(p.min(), p.max())
-+ : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
- {
- }
-
---
-2.14.3
-
diff --git a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
new file mode 100644
index 000000000000..e33f2a19d560
--- /dev/null
+++ b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
@@ -0,0 +1,27 @@
+From 4458a5e93736a324251a356362f0e80e7c42d5be Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Wed, 25 Apr 2018 12:53:37 +0200
+Subject: [PATCH] ssize_t is not std type
+
+---
+ src/lib/WriterPlsParser.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
+index 00dc969b..33b1fa49 100644
+--- a/src/lib/WriterPlsParser.cxx
++++ b/src/lib/WriterPlsParser.cxx
+@@ -316,8 +316,8 @@ bool WindowsInfo::getColumnLimitsFor(int line, std::vector<int> &listPos)
+ if (m_columns[i].m_firstLine == line+2) {
+ numCols=m_columns[i].m_numCol;
+ firstColumn = i;
+- if (numCols > ssize_t(numColumns - firstColumn))
+- numCols = int(ssize_t(numColumns - firstColumn));
++ if (numCols > int(unsigned(numColumns - firstColumn)))
++ numCols = int(unsigned(numColumns - firstColumn));
+ if (numCols <= 1 || m_columns[i].m_col != 1) return false;
+ break;
+ }
+--
+2.14.3
+
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 91280f47460d..0b28836cdb80 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MsWrdStruct \
UnpackedTarball/libmwaw/src/lib/MsWrdText \
UnpackedTarball/libmwaw/src/lib/MsWrdTextStyles \
+ UnpackedTarball/libmwaw/src/lib/MultiplanParser \
UnpackedTarball/libmwaw/src/lib/NisusWrtGraph \
UnpackedTarball/libmwaw/src/lib/NisusWrtParser \
UnpackedTarball/libmwaw/src/lib/NisusWrtStruct \
@@ -185,6 +186,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
+ UnpackedTarball/libmwaw/src/lib/WingzGraph \
UnpackedTarball/libmwaw/src/lib/WingzParser \
UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
UnpackedTarball/libmwaw/src/lib/WriteNowParser \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 851b39bc66d0..bb39a27382b9 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
))
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
- external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+ external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3b4fa0d67f54..13f8408dbcba 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -284,10 +284,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz",
- "sha256": "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea",
+ "url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz",
+ "sha256": "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9",
"type": "file",
- "dest-filename": "external/tarballs/libmwaw-0.3.13.tar.xz"
+ "dest-filename": "external/tarballs/libmwaw-0.3.14.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2",
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 894c0bcf7f9a..f5fc6366bae4 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -33,6 +33,9 @@ void WpftCalcFilterTest::test()
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
{ "Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
};
+ const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
+ { "Multiplan_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 14) },
+ };
const writerperfect::test::WpftOptionalMap_t aWpsOptional{
{ "Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5) },
{ "Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6) },
@@ -40,7 +43,7 @@ void WpftCalcFilterTest::test()
};
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter",
- "/writerperfect/qa/unit/data/calc/libmwaw/");
+ "/writerperfect/qa/unit/data/calc/libmwaw/", aMWAWOptional);
doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter",
"/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional);
doTest("org.libreoffice.comp.Calc.NumbersImportFilter",
diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx b/writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx
new file mode 100644
index 000000000000..48d0fe228d61
--- /dev/null
+++ b/writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx
@@ -0,0 +1,46 @@
+(This file must be converted with BinHex 4.0)
+:"f9YF(4j69!!69"#6P"-38i"!!!!"j`!!!&e at fm4U`!!%qJ!N!F#!N`!'!!1!Q3
+$FJ!1h03!!`!1!*3"TM-0!!J9AKR4!eiCh@&JB&i at N!!!Cf"JB(q2A`2SHM"KB'!
+6Iem$k(Z3!!"q')m at KAiGMaD'IKGH%(Z3!!"q+Bm6HM%8DYF at IiF8Gf!@Ifq&IMb
+3!!"q3*!!!(j%MhiGF)9q'('&INq3!!"q8ipq,(+&ILGcKAjHMc&qBSm8HaCX&)8
+8IN*dKAipE"+&B0d!$K&X*LS5`@!4E#+&X,9R%@`JV(UYIa&9%40rdI)493d4Ie8
+-d*B494!493r3I@%4@"&CIKKAf"&9%(V at N!!!IVD2,4#jBK&9$4D&%983&SCK%9S
+4 at a#3!!"S$@*JN!!!$9Gh'"C[K3fQ&SF9Bmm1$9Ch*"C`K3e at Gc!@FB89DXm($9G
+h+KCbK3eAG`kj'JfRb"CRB'"JMbaK%9`4A3pYN!!!B*!%MaD(CpeqQhPl%981%@`
+JKApR%@`DV(UYH@&R%@`LV(UYIUr4443494&SeASV$PB4E"D&$PJ4E"b&$PF4E"L
+&Ia&9$"&@hmm&%9E5IK)1 at 4&X(S9r%982%9IIc`849p*q%K&9#a&X'S9qBE(r"f$
+G!"%3E#SS%'`Z*a(!B4"X*)8394)393VIdBPK%&8)%&8*%&85N!!!D"F+B@#3!!!
+-GdBXI`ah5`pSeATY+`jh!,ie$K"X*+akVAiF$lP9$(G,%Yr36Q!U$3r4)fJ,BQ#
+3!!!0&G%9#kFpV6d,Ik9q#&Gh at Ri09hG82Ddp0!Pjf@!U$3r4#QJ+BQ#3!!!d#AR
+bD"--GdYJN!!!$(G,&)82&G%#$l89hAPZB0d!!!MFe`!"!!J!"K8KL0d!&3"D!!)
+!!"PN!!+NcJ$,!!S%8M&$-31,AJ!$Lei!!)YH!!1-TJ!#T0B!!iYH!!+Pl!,m!!B
+L1J!#DiJ"![rr"!!LJJ!#Di3"!rrr"!!LbJ!#Di!""2rr"!!M%J!#Dh`""Irr"!!
+M at J!#DhJ""[rr"!!MSJ!#Dh3""rrr)!')qJ#3"!%!rrmJ!BP#!*!%!3(rrb!"LKJ
+!!!!-!"J!@3!-!"N!!U9Z!!+PC!!(!!B!$!!B!GN!$!'C!!)!!!!'!!U!"J!!!!1
+-T[rdrqF!!SRN!!)!N!F$!!+PS!!#TDJ!!J!#TDS!!U at d!!+PXJ!!!!+)h!!1!!+
+)i!!!!!%!!3#3"(rr!%F!$!(R!3S!N"i"!*"83!#!!-!"!!&!!B!"`!)!!N!#J!,
+!!`!$3!1!!m!%!!4!")!%`!8!"8!&J!A!"J!'3!D!"X!(!!G!"i!(`!J!#%!)J!M
+!#3!*3!Q!#F!+!!T!#S!+`!X!#d!,J![!$!!-3!b!$-!0!!e!$B!0`!i!$N!1J!l
+!$`!23!q!$m"rr`!!!Pd&03!!!"8!@J!#!!!CC!!#T-i!b`!+"&)a3c%$Lei!!iY
+H!!#,AJ!$M+B!!U6@!!1,AJ!#TH`#r!!')MS!!QZ)!3,rr`3!)S)!!QZ%!32rr`3
+!)XS!!QZ!!36rr`3!)a)!!QYm!3Arr`3!)eS!!QYi!3Err`3!)k)!!QYd!*!T5!"
+)!$B!0J!"!!%!!!!$!!N!&3"D!!)!!"PN!!+NcJ$,!!S%8M&$-31,AJ!$Lei!!)Y
+H!!1-TJ!#T0B!!iYH!!+Pl!,m!!BL1J!#DiJ"![rr"!!LJJ!#Di3"!rrr"!!LbJ!
+#Di!""2rr"!!M%J!#Dh`""Irr"!!M at J!#DhJ""[rr"!!MSJ!#Dh3""rrr)!')qJ#
+3"!%!rrmJ!BP#!*!%!3(rrb!"LKJ!!!!-!"J!@3!-!"N!!U9Z!!+PC!!(!!B!$!!
+B!GN!$!'C!!)!!!!'!!U!"J!!!!1-T[rdrqF!!SRN!!)!N!F$!!+PS!!#TDJ!!J!
+#TDS!!U at d!!+PXJ!!!!+)h!!1!!+)i!!!!"8!@J!#!!!CC!!#T-i!b`!+"&)a3c%
+$Lei!!iYH!!#,AJ!$M+B!!U6@!!1,AJ!#TH`#r!!')MS!!QZ)!3,rr`3!)S)!!QZ
+%!32rr`3!)XS!!QZ!!36rr`3!)a)!!QYm!3Arr`3!)eS!!QYi!3Err`3!)k)!!QY
+d!3Irrb!"L2S!N!3"!2rr)!'*3J#3"!%"rrmJ!BSB!!!!$!!B!&N!$!!C!!+PEJ!
+#T at 3!"`!'!!`!'!(C!!`"Q3!#!!!!"J!+J!B!!!!$M+Erp2rR!!+*j!!#!*!(!`!
+#TD!!!U at S!!)!!U at U!!+PY!!#TE)!!!!#L0`!$J!#L1!!N!ErN!3!N!X#!!%!!!!
+m!$`!2J!q!$i!!J"!!%!!3J#3"IX"f!!-!"N!q`(B!*!&&!!(rqIrp-!!N!C9!&8
+!$!!C!&8!93#3"3F!!IrRrr6!!!!!)!'Q+N'8!!!"!!!!!5m!!!![!!!!4J!#TDJ
+!!J!#TDS!!U at d!!+PXJ!!!!+)h!!1!!+)i!!!"f9YF(4j69!#!!!!69"#6P"-38i
+!N!S0*!!!69"#6P"-38i!N"M at DUXH!!!(R!!!!A8LbJ!#Di!""2rr"!!M%J!#Dh`
+""Irr"!!M at J!#DhJ""[rr"!!MSJ!#Dh3""rrr)!')qJ#3"!%!rrmJ!BP#!*!%!3(
+rrb!"LKJ!!!!-!"J!@3!-!"N!!U9Z!!+PC!!(!!B!$!!B!GN!$!'C!!)!!!!'!!U
+!"J!!!!1-T[rdrqF!!J!!!!F'4'pXE'&b!!!!)#iX,#3!!0!!!#rrB#""63!J8%d
+!1J#3#J%!!!%!!!!",`!!!#m!!!"'!!*VQ!03!!!!(!"'!!&69&)J!!!!%NP19%`
+!!!!H!9lrr`#3#[rr)!!!#`!#L23p+3:
More information about the Libreoffice-commits
mailing list