From 26d9efd36a16d2095d8fb885290c6816082ec814 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 15 Aug 2013 10:40:35 +0200 Subject: DOCX import: handle w:leftFromText and w:rightFromText for floating tables Left margin wasn't implemented, that's simple. Right margin of the table was set to the cell margin in commit 53d27a30ce5f2c9f7d37a4089286116854c16215, which turns out to be wrong: it's true that the right margin should be >0, but not because of the cell margin but because of the table margin. The new behavior matches what the binary import always did. Change-Id: Ifc24e4f086c49d5d575defdfca1d27e497fa03dc --- sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index c85b28824311..bf7db73700f5 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1566,7 +1566,7 @@ void Test::testTableFloating() // This was 0, should be the the opposite of (left margin + half of the border width). CPPUNIT_ASSERT_EQUAL(sal_Int32(-199), getProperty(xFrame, "HoriOrientPosition")); // Was 0 as well, should be the right margin. - CPPUNIT_ASSERT_EQUAL(sal_Int32(191), getProperty(xFrame, "RightMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getProperty(xFrame, "RightMargin")); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); -- cgit