diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-15 10:40:35 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-15 17:09:11 +0200 |
| commit | 26d9efd36a16d2095d8fb885290c6816082ec814 (patch) | |
| tree | fb5dd9394bd1e96e974dd91b0d4951d2492de7ab /sw | |
| parent | 69fd51d606619d90f291059b1cd82ec65a2c91e5 (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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<sal_Int32>(xFrame, "HoriOrientPosition")); // Was 0 as well, should be the right margin. - CPPUNIT_ASSERT_EQUAL(sal_Int32(191), getProperty<sal_Int32>(xFrame, "RightMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(250), getProperty<sal_Int32>(xFrame, "RightMargin")); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); |