diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-06 15:15:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-06 15:56:27 +0100 |
| commit | cbd0fbc287051f918e4adb32b3e9b58dfbf8059d (patch) | |
| tree | ef1adb4833624eeeda079b3cf0f1073f856faa32 /sw/qa | |
| parent | f355bad3a055c6369d1cae4afd0c02d181584b09 (diff) | |
DOCX import: fix <w:tblW w:type="auto"/> handling when cells have fixed widths
Commit 74c5ed19f430327988194cdcd6bdff09591a93fa (DOCX import fix for
table with auto size, 2013-06-26) correctly recognized that in case the
width type is auto, that doesn't always mean text::SizeType::VARIABLE.
However, when the size is fixed, then we should simply not do anything,
and that'll lead to the right behavior (by setting the column separators
on each row), don't try to be smart and try to set
TablePropertyMap::TABLE_WIDTH here.
Change-Id: I997b88e5fa34bbabe7c6940879c81a1d62d69043
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size2.docx | bin | 0 -> 12907 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size2.docx b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size2.docx Binary files differnew file mode 100644 index 000000000000..2125f09da790 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size2.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 39925645338e..d4d17663fdec 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1393,6 +1393,15 @@ DECLARE_OOXMLIMPORT_TEST(testTableAutoColumnFixedSize, "table-auto-column-fixed- CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(3996)), getProperty<sal_Int32>(xTextTable, "Width")); } +DECLARE_OOXMLIMPORT_TEST(testTableAutoColumnFixedSize2, "table-auto-column-fixed-size2.docx") +{ + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0), uno::UNO_QUERY); + // This was 17907, i.e. the sum of the width of the 3 cells (10152 twips each), which is too wide. + CPPUNIT_ASSERT_EQUAL(sal_Int32(16891), getProperty<sal_Int32>(xTextTable, "Width")); +} + DECLARE_OOXMLIMPORT_TEST(testFdo46361, "fdo46361.docx") { uno::Reference<container::XIndexAccess> xGroupShape(getShape(1), uno::UNO_QUERY); |