filter/source/config/fragments/filters/AppleKeynote.xcu | 2 +-
filter/source/config/fragments/filters/AppleNumbers.xcu | 2 +-
filter/source/config/fragments/filters/ApplePages.xcu | 2 +-
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 4a7ebfea57094b914c4b1c3e46936dbf67dec499
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 22 17:43:36 2018 +0200
all Keynote/Pages/Numbers versions are supported
Change-Id: I5c7ac03fdea3ebdef720a65e7a694deae98e5d97
Reviewed-on: https://gerrit.libreoffice.org/53293
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/filter/source/config/fragments/filters/AppleKeynote.xcu
b/filter/source/config/fragments/filters/AppleKeynote.xcu
index d55c204bb283..48a99ba7c85f 100644
--- a/filter/source/config/fragments/filters/AppleKeynote.xcu
+++ b/filter/source/config/fragments/filters/AppleKeynote.xcu
@@ -15,7 +15,7 @@
<value>org.libreoffice.comp.Impress.KeynoteImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Apple Keynote 5</value>
+ <value xml:lang="en-US">Apple Keynote</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/AppleNumbers.xcu
b/filter/source/config/fragments/filters/AppleNumbers.xcu
index a789aec70dc5..2bfa87072941 100644
--- a/filter/source/config/fragments/filters/AppleNumbers.xcu
+++ b/filter/source/config/fragments/filters/AppleNumbers.xcu
@@ -15,7 +15,7 @@
<value>org.libreoffice.comp.Calc.NumbersImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Apple Numbers 2</value>
+ <value xml:lang="en-US">Apple Numbers</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
diff --git a/filter/source/config/fragments/filters/ApplePages.xcu
b/filter/source/config/fragments/filters/ApplePages.xcu
index e7fd4d732e10..25ca2f015c23 100644
--- a/filter/source/config/fragments/filters/ApplePages.xcu
+++ b/filter/source/config/fragments/filters/ApplePages.xcu
@@ -15,7 +15,7 @@
<value>org.libreoffice.comp.Writer.PagesImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">Apple Pages 4</value>
+ <value xml:lang="en-US">Apple Pages</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
commit 43374afb82ee4a011b813dc76fbf5f9ca6c6112b
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 22 17:41:30 2018 +0200
rename test files
Change-Id: I40b58b2a6df33783073731790d17aacc35e0b75c
Reviewed-on: https://gerrit.libreoffice.org/53292
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 4156f394665a..f6f7608f7dad 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -32,9 +32,9 @@ void WpftImpressFilterTest::test()
{
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
{ "Keynote_1.key", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
- { "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
- { "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
- { "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
+ { "Keynote_2.key", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
+ { "Keynote_3.key", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
+ { "Keynote_6.key", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
};
const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
{ "ClarisWorks_6.0.cwk", REQUIRE_MWAW_VERSION(0, 3, 3) },
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v2.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_2.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v2.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_2.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v3.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_3.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v3.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_3.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v4.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_4.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v4.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_4.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v5.key
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_5.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v5.key
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_5.key
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_6.key
similarity index 100%
rename from writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip
rename to writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_6.key
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
