From ee6cd34eb3a2bd1f1340063ee4b90a72ff0c9532 Mon Sep 17 00:00:00 2001 From: Tibor Nagy Date: Thu, 9 Jul 2020 09:54:15 +0200 Subject: [PATCH] tdf#123621 sw: fix textbox position according to DOCX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit i.e. when spAutoFit is present in DOCX, and size of the textbox is relative. See also commit cab956c480eb4f619580285c7b9a15b9e6d9b780 (tdf#112312 DOCX legacy shape export: keep fixed size). Co-authored-by: Attila Szűcs (NISZ) Change-Id: I29af97001954ad353a386164b68cd22f6230e3e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98401 Tested-by: László Németh Reviewed-by: László Németh --- sw/qa/extras/ooxmlexport/data/tdf123621.docx | Bin 0 -> 14753 bytes sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 11 +++++++++++ sw/source/core/layout/anchoreddrawobject.cxx | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf123621.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf123621.docx b/sw/qa/extras/ooxmlexport/data/tdf123621.docx new file mode 100644 index 0000000000000000000000000000000000000000..471b6ef71e95040e375e14e217f4e95b48702ccc GIT binary patch literal 14753 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 xShape(getShape(1), uno::UNO_QUERY); // positionV's posOffset from the bugdoc, was 0. - CPPUNIT_ASSERT(6985 <= getProperty(xShape, "VertOrientPosition")); + CPPUNIT_ASSERT(6879 <= getProperty(xShape, "VertOrientPosition")); // This was -1 (default), make sure the background color is set. CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty(xShape, "FillColor")); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 6168211ce34e..f3d2df38cb3d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -29,6 +29,17 @@ protected: } }; +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf123621, "tdf123621.docx") +{ + xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); + if (!pXmlDocument) + return; + + assertXPathContent(pXmlDocument, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor" + "/wp:positionV/wp:posOffset", "1080135"); +} + + DECLARE_OOXMLEXPORT_TEST(testTdf133334_followPgStyle, "tdf133334_followPgStyle.odt") { CPPUNIT_ASSERT_EQUAL(2, getPages()); diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 1ea69271f202..cc84e0bc4597 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -34,6 +34,7 @@ #include #include #include +#include using namespace ::com::sun::star; @@ -681,8 +682,9 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth()); } + auto pObjCustomShape = dynamic_cast(GetDrawObj()); long nTargetHeight = aCurrObjRect.GetHeight( ); - if ( GetDrawObj( )->GetRelativeHeight( ) ) + if ( GetDrawObj( )->GetRelativeHeight( ) && (!pObjCustomShape || !pObjCustomShape->IsAutoGrowHeight()) ) { long nHeight = 0; if (GetDrawObj()->GetRelativeHeightRelation() == text::RelOrientation::FRAME)