diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-05-07 14:37:18 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-05-07 15:13:09 +0200 |
commit | cb088e6d20ce5411035c163f57ba1532657a7509 (patch) | |
tree | 777794fad5ebb6bb8f63330a79d2c168cb5d96d5 /sw/qa | |
parent | bb0a43fef9b377f216641dcb4a13e09ad42a8c04 (diff) |
sw_filters_test: add support for ooxml files
The motivation is that if -- after fixing a crash -- the document looks
OK, then all the paperwork in the ooxmlimport isn't necessary, just drop
in the file to qa/core/data/ooxml/pass/, and we're done.
Change-Id: I2287189bd3c49c5e53489f9d89a6341685359b33
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/core/data/ooxml/fail/.gitignore | 0 | ||||
-rw-r--r-- | sw/qa/core/data/ooxml/indeterminate/.gitignore | 0 | ||||
-rw-r--r-- | sw/qa/core/data/ooxml/pass/fdo64256.docx (renamed from sw/qa/extras/ooxmlimport/data/fdo64256.docx) | bin | 5602 -> 5602 bytes | |||
-rw-r--r-- | sw/qa/core/filters-test.cxx | 5 | ||||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 |
5 files changed, 9 insertions, 5 deletions
diff --git a/sw/qa/core/data/ooxml/fail/.gitignore b/sw/qa/core/data/ooxml/fail/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sw/qa/core/data/ooxml/fail/.gitignore diff --git a/sw/qa/core/data/ooxml/indeterminate/.gitignore b/sw/qa/core/data/ooxml/indeterminate/.gitignore new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sw/qa/core/data/ooxml/indeterminate/.gitignore diff --git a/sw/qa/extras/ooxmlimport/data/fdo64256.docx b/sw/qa/core/data/ooxml/pass/fdo64256.docx Binary files differindex e8e901dd10e2..e8e901dd10e2 100644 --- a/sw/qa/extras/ooxmlimport/data/fdo64256.docx +++ b/sw/qa/core/data/ooxml/pass/fdo64256.docx diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index d90627e13bee..26fcd58049af 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -107,6 +107,11 @@ void SwFiltersTest::testCVEs() testDir(OUString("Text (encoded)"), getURLFromSrc("/sw/qa/core/data/txt/"), OUString(FILTER_TEXT_DLG)); + + testDir(OUString("MS Word 2007 XML"), + getURLFromSrc("/sw/qa/core/data/ooxml/"), + OUString(), + SFX_FILTER_STARONEFILTER); } void SwFiltersTest::setUp() diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index cadc68b7fbdd..8c6406304c5a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -77,7 +77,7 @@ public: void testN778140(); void testN778828(); void testInk(); - void testNoCrash(); + void testN779834(); void testN779627(); void testN779941(); void testFdo55187(); @@ -157,7 +157,7 @@ void Test::run() {"n778140.docx", &Test::testN778140}, {"n778828.docx", &Test::testN778828}, {"ink.docx", &Test::testInk}, - {"n779834.docx", &Test::testNoCrash}, + {"n779834.docx", &Test::testN779834}, {"n779627.docx", &Test::testN779627}, {"n779941.docx", &Test::testN779941}, {"fdo55187.docx", &Test::testFdo55187}, @@ -191,7 +191,6 @@ void Test::run() {"n592908-frame.docx", &Test::testN592908_Frame}, {"n592908-picture.docx", &Test::testN592908_Picture}, {"n779630.docx", &Test::testN779630}, - {"fdo64256.docx", &Test::testNoCrash}, }; header(); for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) @@ -879,9 +878,9 @@ void Test::testInk() CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.OpenBezierShape")); } -void Test::testNoCrash() +void Test::testN779834() { - // These documents simply crashed the importer. + // This document simply crashed the importer. } void Test::testN779627() |