diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-03-26 17:01:27 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-03-26 17:36:49 +0100 |
| commit | 77f4c4b8db2671921dd378ac4e255b700c7cf332 (patch) | |
| tree | c460290d0d5bfd07c4094f3e35497b48e9b71fae /sw/qa/extras/ooxmlimport | |
| parent | a3b0d947b026731af6d29891876593c82c2bc65b (diff) | |
Revert "rhbz#1075124: writerfilter: fix tables with negative left margin"
It appears that this was just a workaround that incidentally worked.
Making the negative value even larger (in abs value) doesn't seem to make
a difference for MSO, but LO fails again. A proper fix (better workaround?)
will follow.
This reverts commit 76aa23c59b4c81ea7b9d974a1a0a9e39c6bf8741.
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/rhbz1075124.docx | bin | 4216 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 16 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx b/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx Binary files differdeleted file mode 100644 index 3b3170101718..000000000000 --- a/sw/qa/extras/ooxmlimport/data/rhbz1075124.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 6943c4b366d1..b86d26d2a9a0 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/view/XFormLayerAccess.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/TableBorder2.hpp> -#include <com/sun/star/table/TableBorderDistances.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> @@ -211,21 +210,6 @@ DECLARE_OOXMLIMPORT_TEST(testRhbz988516, "rhbz988516.docx") getProperty<OUString>(getParagraph(3), "NumberingStyleName")); } -DECLARE_OOXMLIMPORT_TEST(testRhbz1075124, "rhbz1075124.docx") -{ - // negative left margin on table wrapped around to 64k unsigned - uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, - uno::UNO_QUERY); - uno::Reference<container::XIndexAccess> xTables( - xTablesSupplier->getTextTables(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(-243), - getProperty<sal_Int32>(xTables->getByIndex(0), "LeftMargin")); - table::TableBorderDistances dists( - getProperty<table::TableBorderDistances>(xTables->getByIndex(0), - "TableBorderDistances")); - CPPUNIT_ASSERT_EQUAL(sal_Int16(26), dists.LeftDistance); -} - DECLARE_OOXMLIMPORT_TEST(testFdo49940, "fdo49940.docx") { uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); |