[Libreoffice-commits] core.git: 4 commits - external/libetonyek writerperfect/qa
David Tardon
dtardon at redhat.com
Thu May 29 08:20:40 PDT 2014
dev/null |binary
external/libetonyek/0001-fix-v.3-version-string.patch | 26 +
external/libetonyek/UnpackedTarball_libetonyek.mk | 6
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1
writerperfect/qa/unit/WpftDrawFilterTest.cxx | 1
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 2
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 2
writerperfect/qa/unit/data/writer/libmwaw/fail/HanMac_2.0.4J.hqx | 178 ----------
writerperfect/qa/unit/data/writer/libmwaw/pass/ClarisWorks_6.0.cwk |binary
writerperfect/qa/unit/data/writer/libmwaw/pass/HanMac_2.0.4J.hqx | 178 ++++++++++
10 files changed, 214 insertions(+), 180 deletions(-)
New commits:
commit 895d63be19f945a98d705fea3d5d067ff66f8bc1
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 29 17:18:02 2014 +0200
these formats are supported by libmwaw 0.3.x
Change-Id: Ie045a3d700d498d58bad1bfcaf4cfd81b63005a6
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 8028522..904daab 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -34,7 +34,7 @@ void WpftWriterFilterTest::test()
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
- // doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
+ doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
}
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/fail/.gitignore b/writerperfect/qa/unit/data/writer/libmwaw/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/fail/ClarisWorks_6.0.cwk b/writerperfect/qa/unit/data/writer/libmwaw/pass/ClarisWorks_6.0.cwk
similarity index 100%
rename from writerperfect/qa/unit/data/writer/libmwaw/fail/ClarisWorks_6.0.cwk
rename to writerperfect/qa/unit/data/writer/libmwaw/pass/ClarisWorks_6.0.cwk
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/fail/HanMac_2.0.4J.hqx b/writerperfect/qa/unit/data/writer/libmwaw/pass/HanMac_2.0.4J.hqx
similarity index 100%
rename from writerperfect/qa/unit/data/writer/libmwaw/fail/HanMac_2.0.4J.hqx
rename to writerperfect/qa/unit/data/writer/libmwaw/pass/HanMac_2.0.4J.hqx
commit e120b369f10207f4057ebeae92c1ee25f08e4904
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 29 17:14:22 2014 +0200
enable integration test for libmwaw draw import
Change-Id: I2109b948971776f06c3574ad6e7a9bebc33a40b3
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 3de83ac..3b0b0ef 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -35,6 +35,7 @@ void WpftDrawFilterTest::test()
doTest("com.sun.star.comp.Draw.CMXImportFilter", "/writerperfect/qa/unit/data/draw/libcdr-cmx/");
doTest("com.sun.star.comp.Draw.FreehandImportFilter", "/writerperfect/qa/unit/data/draw/libfreehand/");
doTest("com.sun.star.comp.Draw.MSPUBImportFilter", "/writerperfect/qa/unit/data/draw/libmspub/");
+ doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter", "/writerperfect/qa/unit/data/draw/libmwaw/");
doTest("com.sun.star.comp.Draw.VisioImportFilter", "/writerperfect/qa/unit/data/draw/libvisio/");
doTest("com.sun.star.comp.Draw.WPGImportFilter", "/writerperfect/qa/unit/data/draw/libwpg/");
}
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/fail/.gitignore b/writerperfect/qa/unit/data/draw/libmwaw/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/indeterminate/.gitignore b/writerperfect/qa/unit/data/draw/libmwaw/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/.gitignore b/writerperfect/qa/unit/data/draw/libmwaw/pass/.gitignore
new file mode 100644
index 0000000..e69de29
commit 64a9f9968a6aa801af183a142c490943702a2d68
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 29 17:13:33 2014 +0200
enable integration test for libmwaw calc import
Change-Id: I9ff3ed6b74d93483a2157087707c5ec47888dd6a
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index ba1ed1e..6af5c04 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -31,6 +31,7 @@ WpftCalcFilterTest::WpftCalcFilterTest()
void WpftCalcFilterTest::test()
{
+ doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/");
}
diff --git a/writerperfect/qa/unit/data/calc/libmwaw/fail/.gitignore b/writerperfect/qa/unit/data/calc/libmwaw/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore b/writerperfect/qa/unit/data/calc/libmwaw/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/writerperfect/qa/unit/data/calc/libmwaw/pass/.gitignore b/writerperfect/qa/unit/data/calc/libmwaw/pass/.gitignore
new file mode 100644
index 0000000..e69de29
commit 89e65184bc9e895085d21545c79f4089c9654c1f
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 29 17:09:36 2014 +0200
fix detection of Keynote 3 documents
Change-Id: I1c3e6b2809ee8b63f6f4db886bf6358b668b505f
diff --git a/external/libetonyek/0001-fix-v.3-version-string.patch b/external/libetonyek/0001-fix-v.3-version-string.patch
new file mode 100644
index 0000000..d344259
--- /dev/null
+++ b/external/libetonyek/0001-fix-v.3-version-string.patch
@@ -0,0 +1,26 @@
+From 16b7bf009a06ac48c69f94b778a09151aa20fa53 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Thu, 29 May 2014 17:04:05 +0200
+Subject: [PATCH] fix v.3 version string
+
+Change-Id: I689fd53bedeccb8d1cda5275832f36333fe1d108
+---
+ src/lib/KEY2Token.gperf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/KEY2Token.gperf b/src/lib/KEY2Token.gperf
+index d1bf501..483ca97 100644
+--- a/src/lib/KEY2Token.gperf
++++ b/src/lib/KEY2Token.gperf
+@@ -25,7 +25,7 @@ struct Token
+ 1,_1
+ 2004102100,VERSION_STR_2
+ 2005092101,COMPATIBLE_VERSION_STR_3,
+-2005140600,VERSION_STR_3
++2005112100,VERSION_STR_3
+ 72007061400,VERSION_STR_4
+ 92008102400,VERSION_STR_5
+ BGBuildChunk,BGBuildChunk
+--
+1.9.3
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 52e6a95..4655cbb 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
$(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+ external/libetonyek/0001-fix-v.3-version-string.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index f148c8f..531da4f 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,7 +31,7 @@ WpftImpressFilterTest::WpftImpressFilterTest()
void WpftImpressFilterTest::test()
{
- // doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/");
+ doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/");
}
CPPUNIT_TEST_SUITE_REGISTRATION(WpftImpressFilterTest);
More information about the Libreoffice-commits
mailing list