configure.ac
| 2
download.lst
| 4 -
external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
| 27 ---------
external/libwps/0001-drop-unneeded-include.patch.1
| 24 --------
external/libwps/Library_wps.mk
| 1
external/libwps/UnpackedTarball_libwps.mk
| 5 -
filter/Configuration_filter.mk
| 2
filter/source/config/fragments/filters/MS_Multiplan.xcu
| 29 ++++++++++
filter/source/config/fragments/types/calc_MS_Multiplan.xcu
| 26 ++++++++
solenv/flatpak-manifest.in
| 6 +-
writerperfect/qa/unit/WpftCalcFilterTest.cxx
| 1
writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3
|binary
writerperfect/source/calc/MSWorksCalcImportFilter.cxx
| 5 +
13 files changed, 70 insertions(+), 62 deletions(-)
New commits:
commit 9739749ba8da87001b73027136f120ef532f0b2b
Author: David Tardon <dtar...@redhat.com>
Date: Wed Apr 25 07:02:54 2018 +0200
upload libwps 0.4.9
Change-Id: I9571d91d6ce81d7e8752f24c3220f858a5303986
Reviewed-on: https://gerrit.libreoffice.org/53431
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index d0ca94754b0f..bdc3efa59172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7853,7 +7853,7 @@
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.9])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 897a6c83498e..0fa8763fdeae 100644
--- a/download.lst
+++ b/download.lst
@@ -242,8 +242,8 @@ export WPD_TARBALL :=
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM :=
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
export WPG_VERSION_MICRO := 2
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM :=
e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
-export WPS_VERSION_MICRO := 8
+export WPS_SHA256SUM :=
13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
+export WPS_VERSION_MICRO := 9
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
deleted file mode 100644
index 40c929ab8ea0..000000000000
---
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2a3465442d1305c7fec55e986c9793a86e571baa Mon Sep 17 00:00:00 2001
-From: osnola <alo...@loria.fr>
-Date: Fri, 24 Nov 2017 12:32:30 +0100
-Subject: [PATCH] Lotus .123: do no assume that a file containing a fdc's
- structure is a Mac file :-~
-
----
- src/lib/Lotus.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/lib/Lotus.cpp b/src/lib/Lotus.cpp
-index d145014..514faad 100644
---- a/src/lib/Lotus.cpp
-+++ b/src/lib/Lotus.cpp
-@@ -3046,8 +3046,7 @@ bool
LotusParser::readMacFontName(std::shared_ptr<WPSStream> stream, long endPos
- }
- else if (nameOk && !name.empty())
- {
-- auto encoding=name!="Symbol" ?
libwps_tools_win::Font::MAC_ROMAN : libwps_tools_win::Font::MAC_SYMBOL;
-- LotusParserInternal::Font font(encoding);
-+ LotusParserInternal::Font font(getDefaultFontType());
- font.m_name=name;
- m_state->m_fontsMap.insert(std::map<int,
LotusParserInternal::Font>::value_type(id,font));
- }
---
-2.14.3
-
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1
b/external/libwps/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 4d7b5a494530..000000000000
--- a/external/libwps/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
-From: David Tardon <dtar...@redhat.com>
-Date: Mon, 27 Nov 2017 19:32:53 +0100
-Subject: [PATCH] drop unneeded include
-
----
- src/lib/QuattroSpreadsheet.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
-index 8d7e1c0..bc35bdf 100644
---- a/src/lib/QuattroSpreadsheet.cpp
-+++ b/src/lib/QuattroSpreadsheet.cpp
-@@ -21,7 +21,6 @@
-
- #include <stdlib.h>
- #include <string.h>
--#include <strings.h>
-
- #include <algorithm>
- #include <cctype>
---
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index d1525ecdeb11..4c2cf0e3b1d0 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
+ UnpackedTarball/libwps/src/lib/Multiplan \
UnpackedTarball/libwps/src/lib/Quattro \
UnpackedTarball/libwps/src/lib/QuattroDos \
UnpackedTarball/libwps/src/lib/QuattroDosChart \
diff --git a/external/libwps/UnpackedTarball_libwps.mk
b/external/libwps/UnpackedTarball_libwps.mk
index 742392b2b346..d712f25406bd 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,9 +35,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
- external/libwps/0001-drop-unneeded-include.patch.1 \
-
external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
\
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 4ef9adb18431..35d7620f6f70 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -493,6 +493,7 @@ $(eval $(call
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f
MWAW_Database \
MWAW_Spreadsheet \
StarOffice_Spreadsheet \
+ calc_MS_Multiplan \
))
$(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
@@ -537,6 +538,7 @@ $(eval $(call
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
MWAW_Database \
MWAW_Spreadsheet \
StarOffice_Spreadsheet \
+ MS_Multiplan \
))
# fcfg_draw
diff --git a/filter/source/config/fragments/filters/MS_Multiplan.xcu
b/filter/source/config/fragments/filters/MS_Multiplan.xcu
new file mode 100644
index 000000000000..f10e0ddcf6f9
--- /dev/null
+++ b/filter/source/config/fragments/filters/MS_Multiplan.xcu
@@ -0,0 +1,29 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="Microsoft Multiplan" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ </prop>
+ <prop oor:name="FilterService">
+ <value>org.libreoffice.comp.Calc.MSWorksCalcImportFilter</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Microsoft Multiplan</value>
+ </prop>
+ <prop oor:name="FileFormatVersion">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>calc_MS_Multiplan</value>
+ </prop>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.sheet.SpreadsheetDocument</value>
+ </prop>
+</node>
diff --git a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
new file mode 100644
index 000000000000..aec1df902889
--- /dev/null
+++ b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu
@@ -0,0 +1,26 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+
+<node oor:name="calc_MS_Multiplan" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>org.libreoffice.comp.Calc.MSWorksCalcImportFilter</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value/>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>true</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>Microsoft Multiplan</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value>Microsoft Multiplan</value>
+ </prop>
+</node>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 13f8408dbcba..c3302fbe5d72 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -338,10 +338,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";,
- "sha256":
"e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e",
+ "url":
"https://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz";,
+ "sha256":
"13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.8.tar.xz"
+ "dest-filename": "external/tarballs/libwps-0.4.9.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";,
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index f5fc6366bae4..d31075733e80 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -39,6 +39,7 @@ void WpftCalcFilterTest::test()
const writerperfect::test::WpftOptionalMap_t aWpsOptional{
{ "Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5) },
{ "Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6) },
+ { "Multiplan_3", REQUIRE_WPS_VERSION(0, 4, 9) },
{ "QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8) },
};
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3
b/writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3
new file mode 100644
index 000000000000..7639d78fbbe6
Binary files /dev/null and
b/writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3 differ
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index c254f70b5198..0972c97df84e 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -403,6 +403,11 @@ bool
MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput
rTypeName = "calc_WPS_QPro_Document";
return true;
}
+ if (creator == libwps::WPS_RESERVED_2)
+ {
+ rTypeName = "calc_MS_Multiplan";
+ return true;
+ }
}
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
