diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2020-04-01 15:04:22 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-21 09:51:35 +0200 |
| commit | 9b7a2d33e9dcb5e4131e4901969d5853efdaf6e8 (patch) | |
| tree | f9704fa3d231f89a95e4ba89cfc497afea5ea1fb /sw | |
| parent | 249428202be04ab9a2271a9cd48922523fa03bc4 (diff) | |
tdf#131775 DOCX DrawingML shape import: fix missing spacing
Character spacing of grouped shapes wasn't imported.
Co-Author: Balazs Regenyi, Szabolcs Toth
Change-Id: I9c4f204a5ab7c7e55e26968a71b315d84e5d8515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91490
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf131775_SpacingGroupShapeText.docx | bin | 0 -> 16290 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf131775_SpacingGroupShapeText.docx b/sw/qa/extras/ooxmlexport/data/tdf131775_SpacingGroupShapeText.docx Binary files differnew file mode 100644 index 000000000000..a7d34d6f24c6 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf131775_SpacingGroupShapeText.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index ee4b35698533..8f800ef1a17d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -1243,6 +1243,18 @@ DECLARE_OOXMLEXPORT_TEST(testNonBMPChar, "nonbmpchar.docx") CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString()); } +DECLARE_OOXMLEXPORT_TEST(testSpaceingGroupShapeText, "tdf131775_SpacingGroupShapeText.docx") +{ + // tdf#131775: Check if correct spaceing. + + xmlDocPtr pXmlDocument = parseExport("word/document.xml"); + if (!pXmlDocument) + return; + + assertXPath(pXmlDocument, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor" + "/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:txbx/w:txbxContent/w:p/w:r/w:rPr/w:spacing", "val", "71"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |