diff options
| author | David Tardon <dtardon@redhat.com> | 2018-04-25 07:02:54 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2018-04-26 10:42:02 +0200 |
| commit | 9739749ba8da87001b73027136f120ef532f0b2b (patch) | |
| tree | a615720b6026401fe0c4486e2f6d892ff286f5c3 /writerperfect | |
| parent | 3b90faa9c51791d01bef69ac6924a71e869f25d7 (diff) | |
upload libwps 0.4.9
Change-Id: I9571d91d6ce81d7e8752f24c3220f858a5303986
Reviewed-on: https://gerrit.libreoffice.org/53431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'writerperfect')
| -rw-r--r-- | writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1 | ||||
| -rw-r--r-- | writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3 | bin | 0 -> 2612 bytes | |||
| -rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 5 |
3 files changed, 6 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 000000000000..7639d78fbbe6 --- /dev/null +++ b/writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3 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; |