summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-05-22 11:34:01 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-09-03 14:46:06 +0200
commitb4951d9993b0bafaa85640dc905567eedc228dc9 (patch)
tree77e1ba18d9bb74c7bb2f9e6ebf8febc12c6c5900 /sw
parentce7aeaa358dc0000dbcaf43c55670345fad8ee86 (diff)
n#816593: Floating table width import fix: adjust the frame width
(cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b) Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152 Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlimport/data/table_width.docxbin6561 -> 6572 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx4
2 files changed, 4 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/table_width.docx b/sw/qa/extras/ooxmlimport/data/table_width.docx
index 26deb6daf35c..02b77c97d89f 100644
--- a/sw/qa/extras/ooxmlimport/data/table_width.docx
+++ b/sw/qa/extras/ooxmlimport/data/table_width.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1db782971ce1..2d5441ab9bba 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1330,6 +1330,10 @@ void Test::testTableWidth()
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
// Relative width wasn't recognized during import.
CPPUNIT_ASSERT_EQUAL(true, bool(getProperty<sal_Bool>(xTables->getByIndex(0), "IsWidthRelative")));
+
+ uno::Reference<text::XTextFramesSupplier> xFramesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xFrames(xFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(xFrames->getByIndex(0), "FrameWidthPercent"));
}
void Test::testConditionalstylesTbllook()