summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlimport
diff options
context:
space:
mode:
authorAdam Co <rattles2013@gmail.com>2014-05-08 14:30:24 +0300
committerMichael Stahl <mstahl@redhat.com>2014-05-08 22:19:03 +0200
commit76bd128ff887b017a481f434c7ac9b1130826341 (patch)
tree2d8bf4385199fd9963f4eb557a66c2d94bc9c273 /sw/qa/extras/ooxmlimport
parenta4e028447e6f06e4d6660dbe95e15dca8cb5cbf2 (diff)
Fix 'outset' and 'inset' table border type import in DOCX and RTF
In the past, LO did not support 'outset' and 'inset' border types for tables, so when encountering them - LO converted them to other types of border. Now that LO supports it - DOCX and RTF filters were changed to import these border types correctly. DOC filter was not changed, because creating a proper DOC sample file that has these border types (needed for the 'bordertest.hxx' file) was not possible right now. So at least DOCX and RTF filters are fixed. Change-Id: Ida2449d45a0ac138388f3cbfeb41657db1d4cda9 Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
-rw-r--r--sw/qa/extras/ooxmlimport/data/all_gaps_word.docxbin12555 -> 10226 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx2
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/all_gaps_word.docx b/sw/qa/extras/ooxmlimport/data/all_gaps_word.docx
index 992fc444e90e..fc52281a2552 100644
--- a/sw/qa/extras/ooxmlimport/data/all_gaps_word.docx
+++ b/sw/qa/extras/ooxmlimport/data/all_gaps_word.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9ea637a3d613..7c4e14b60e51 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -606,7 +606,7 @@ DECLARE_OOXMLIMPORT_TEST(testBnc773061, "bnc773061.docx")
DECLARE_OOXMLIMPORT_TEST(testAllGapsWord, "all_gaps_word.docx")
{
BorderTest borderTest;
- borderTest.testTheBorders(mxComponent);
+ borderTest.testTheBorders(mxComponent, false);
}
DECLARE_OOXMLIMPORT_TEST(testN775906, "n775906.docx")