sw/qa/extras/ooxmlexport/data/tdf133035.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 8 ++++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 45fe51bca2ab534cfe1139b734d839728225d6d9 Author: Attila Bakos <bakos.attilakar...@nisz.hu> AuthorDate: Thu May 14 12:38:28 2020 +0200 Commit: László Németh <nem...@numbertext.org> CommitDate: Thu May 21 11:58:48 2020 +0200 tdf#133035 DOCX export: fix position of unnamed OLE Position export depended on OLE object names, instead of the type of anchoring. Follow-up of commit 2150fdc7d0f63288ac56c33cb898589512057642 (tdf#131539 DOCX export: fix position of OLE objects). Co-authored-by: Tibor Nagy (NISZ) Change-Id: Ib98a19cb012047f37a5830c81541ef00c55589dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94190 Tested-by: László Németh <nem...@numbertext.org> Reviewed-by: László Németh <nem...@numbertext.org> diff --git a/sw/qa/extras/ooxmlexport/data/tdf133035.docx b/sw/qa/extras/ooxmlexport/data/tdf133035.docx new file mode 100644 index 000000000000..c28c119dbccc Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133035.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index dd6544eb3173..e57100bafd47 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -393,6 +393,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf92472, "tdf92472.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:rPr/w:szCs", "val", "20"); } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(Tdf133035, "tdf133035.docx") +{ + auto pxml = parseExport("word/document.xml"); + CPPUNIT_ASSERT(pxml); + OUString aXmlVal = getXPath(pxml, "/w:document/w:body/w:p[1]/w:r[1]/w:object/v:shape", "style"); + CPPUNIT_ASSERT(aXmlVal.indexOf("margin-left:186.6pt") > -1); +} + DECLARE_OOXMLEXPORT_TEST(testTdf131260, "tdf131260.docx") { uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index a5aa741447af..590fcfdad6ae 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5545,7 +5545,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S //This string will store the relative position for aPos OString aAnch; - if (!rFlyFrameFormat->GetName().isEmpty()) + if (rFlyFrameFormat && rFlyFrameFormat->GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR) { //Get the horizontal alignment of the OLE via the frame format, to aHAlign OString aHAlign = convertToOOXMLHoriOrient(rFlyFrameFormat->GetHoriOrient().GetHoriOrient(), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits