summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ww8import
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-01-19 16:27:41 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-01-23 09:16:24 +0000
commit895f4bc27d518ecaa054d812fa6c24fd4301d327 (patch)
tree57eab5088a6d1a565740122f1970ceb5609ca5f1 /sw/qa/extras/ww8import
parent9bd6f00dfe8f71bc9de693bdcd65377ee1e891d0 (diff)
tdf#96277 revert ww8 import: fix upper margin of floating table
commit 3755c87d0426a499d4755e82d8fbc77caa240764 mis-positions non-textframed floating tables. The patch only worked under very ideal circumstances that cannot be identified during import time. Lots of bug reports indicate real world problems with it. This is a pretty safe revert because the code only processes a document one time, so old documents don't depend on this to work. Change-Id: I3b94d27901a20e46c2f5fd4305041d1d28acf33a Reviewed-on: https://gerrit.libreoffice.org/33322 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras/ww8import')
-rw-r--r--sw/qa/extras/ww8import/data/bnc863018.docbin26624 -> 0 bytes
-rw-r--r--sw/qa/extras/ww8import/ww8import.cxx10
2 files changed, 0 insertions, 10 deletions
diff --git a/sw/qa/extras/ww8import/data/bnc863018.doc b/sw/qa/extras/ww8import/data/bnc863018.doc
deleted file mode 100644
index ab7511b57e0a..000000000000
--- a/sw/qa/extras/ww8import/data/bnc863018.doc
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index f26f1cbd05a7..c7f488fc2346 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -42,16 +42,6 @@ DECLARE_WW8IMPORT_TEST(testN816593, "n816593.doc")
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
}
-DECLARE_WW8IMPORT_TEST(testBnc863018, "bnc863018.doc")
-{
- // The problem was that there should be some whitespace above the table,
- // but there wasn't.
- uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> xTable(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
- // This was 0.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getProperty<sal_Int32>(xTable, "TopMargin"));
-}
DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc")
{
uno::Reference<text::XTextSectionsSupplier> xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);