diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-21 16:01:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-21 17:04:46 +0200 |
| commit | d4d0df13bd4291b7f988bdce68a087a58bb4c70f (patch) | |
| tree | 0b1dd7256001cd975d8c8a42238fbabc8a5edab1 /sw | |
| parent | 43c7735d7f175a846a32e63579527dc5d3e640af (diff) | |
DOCX import: fix handling of textframes having shape text ending with a table
Change-Id: I82ef1072bfeb1195152ef7f1ea743653ac102b37
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 2db8917f5c06..f2ab8edc3d7c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1168,12 +1168,9 @@ void Test::testTableFloatingMargins() CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), getProperty<sal_Int32>(xFrame, "TopMargin")); CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), getProperty<sal_Int32>(xFrame, "BottomMargin")); - if (m_bImport) - { - // Paragraph bottom margin wasn't 0 in the A1 cell of the floating table. - xmlDocPtr pXmlDoc = parseExport(); - assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:pict/v:rect/v:textbox/w:txbxContent/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "after", "0"); - } + // Paragraph bottom margin wasn't 0 in the A1 cell of the floating table. + xmlDocPtr pXmlDoc = parseExport(); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:pict/v:rect/v:textbox/w:txbxContent/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "after", "0"); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); |