sw/qa/extras/ooxmlexport/data/tdf123621.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 11 +++++++++++
sw/source/core/layout/anchoreddrawobject.cxx | 12 ++++++++++--
4 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 296d814dcc72ecf15a443aed4d73106cef0672f1
Author: Tibor Nagy <nagy.tib...@nisz.hu>
AuthorDate: Thu Jul 9 09:54:15 2020 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Dec 1 10:20:07 2020 +0100
tdf#138130, tdf#123621 sw: fix textbox position according to DOCX
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 <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
This commit also includes:
Clean-up of commit I29af97001954ad353a386164b68cd22f6230e3e5
Change-Id: I1963a5d899da2d122e60c4d87ca32aba4fb1f32a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102449
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106589
(cherry picked from commit 92f1c430e4e77e71e7c914ad567d4970e5b2cd95)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106672
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123621.docx
b/sw/qa/extras/ooxmlexport/data/tdf123621.docx
new file mode 100644
index 000000000000..471b6ef71e95
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123621.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index f209ed442175..87a5223ccd2b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -236,7 +236,7 @@ DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
// Vertical position of the shape was incorrect due to incorrect nested
mce handling.
uno::Reference<beans::XPropertySet> xShape(getShape(1), uno::UNO_QUERY);
// positionV's posOffset from the bugdoc, was 0.
- CPPUNIT_ASSERT(6985 <= getProperty<sal_Int32>(xShape,
"VertOrientPosition"));
+ CPPUNIT_ASSERT(6879 <= getProperty<sal_Int32>(xShape,
"VertOrientPosition"));
// This was -1 (default), make sure the background color is set.
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty<sal_Int32>(xShape,
"FillColor"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 1950b8349697..1fd8ad4a7d84 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -30,6 +30,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 2cbe4bab0f3b..a908300b0e0c 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -34,6 +34,7 @@
#include <viewimp.hxx>
#include <textboxhelper.hxx>
#include <unomid.h>
+#include <svx/svdoashp.hxx>
using namespace ::com::sun::star;
@@ -681,8 +682,15 @@ SwRect SwAnchoredDrawObject::GetObjBoundRect() const
nTargetWidth = nWidth * (*GetDrawObj( )->GetRelativeWidth());
}
- long nTargetHeight = aCurrObjRect.GetHeight( );
- if ( GetDrawObj( )->GetRelativeHeight( ) )
+ bool bCheck = GetDrawObj()->GetRelativeHeight();
+ if (bCheck)
+ {
+ auto pObjCustomShape = dynamic_cast<const
SdrObjCustomShape*>(GetDrawObj());
+ bCheck = !pObjCustomShape || !pObjCustomShape->IsAutoGrowHeight();
+ }
+
+ long nTargetHeight = aCurrObjRect.GetHeight();
+ if (bCheck)
{
long nHeight = 0;
if (GetDrawObj()->GetRelativeHeightRelation() ==
text::RelOrientation::FRAME)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
