summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-02-13 20:19:04 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-02-13 20:19:49 +0100
commit5e5ec33eb4a4e10afd9c7ee7c269c2c18144d033 (patch)
treecf7c34a098f32051d851c1bf41aa6a3b7bda8e6c /sw
parent146d182a3e489d840c0d753666725ebe2c90368a (diff)
Revert "DOCX import: fix relative width of floating tables"
This reverts commit 7ff8414a411ae35e1fe56e9724646d0e94fa17f6, which was the result of a misunderstending.
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlimport/data/floating-table-with-relative-width.docxbin13314 -> 0 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx12
2 files changed, 0 insertions, 12 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/floating-table-with-relative-width.docx b/sw/qa/extras/ooxmlimport/data/floating-table-with-relative-width.docx
deleted file mode 100644
index 9d88d930277d..000000000000
--- a/sw/qa/extras/ooxmlimport/data/floating-table-with-relative-width.docx
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d60247e672da..3b3a227c63d2 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1848,18 +1848,6 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx")
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8154), getProperty<sal_Int32>(xTables->getByIndex(0), "Width"));
}
-
-DECLARE_OOXMLIMPORT_TEST(testFloatingTableWithRelativeWidth, "floating-table-with-relative-width.docx")
-{
- // Floating tables are imported to text frames and the size is defined by the frame size.
- // Width of the text frame including table was relative to the paragraph area and not to the page.
- uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(80), getProperty<sal_Int32>(xFrame, "RelativeWidth"));
- CPPUNIT_ASSERT_EQUAL(sal_Int16(text::RelOrientation::PAGE_FRAME), getProperty<sal_Int16>(xFrame, "RelativeWidthRelation"));
-
-}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();