tdf#142304 a.o. Improve wrap margins in docx filters

LO uses the bounding box of the shape in case of type 'Parallel'. Word
uses in the corresponding wrap 'square' a box based on the full size
of the shape. That will be very different in some cases, e.g. for an
arc. And Word exchanges width and height in case of rotation angle in
[45°;135°[ and [225°; 315°[. To get the same appearance as in Word,
the wrap margins are suitable expanded on import.

Word puts the additional space needed for fat strokes into effectExtent
in case of wrap 'inline', so there is no need to add the half strokes
width in addition. Word determines the area for the shape depending
on rotation angle. Both are now considered. Total same appearance is
not possible because it would need negative vertical wrap margins,
which are currently faulty in LO, see tdf#141880.

Patch solves in addition tdf#142486, tdf#142305

The export to Word would require negative values in effectExtent in
some cases. They are allowed in OOXML but not supported in Word. My
idea is to switch to wrap mode 'Tight' if needed. But export of wrap
has so many bad parts, that it needs separate work and is not
included here.

Handling of border width for export of own frames is missing.

Unittest changes
----------------
testDmlTextshapeB and TestDmlTextshape in ooxmlexport6.cxx are set to
current values. Import and Export still have large errors with these
shapes and correct value from file is unknown. So an exact value is
pointless. Only the original problem needs to be still fixed, which
is the case.

testWpsOnly in ooxmlexport10.cxx. I have removed the test for
LeftMargin equals 0. The test makes no sense, because the original
file has distL=114300.

testTdf124600 in ooxmlimport2.cxx.
I have added a tolerance. It would fail with Expected: 2029,
Actual:2028, likely a rounding problem somewhere.

testTdf124600 in ooxmlimport2.cxx
Word refers to outer edge of the border for align='left', LO aligns
at snap rectangle. The different intepretations become visible if a
thick line is used. LO needs a margin to get the same rendering as in
Word. So an expected value of 0 is wrong and I have disabled the test
for now. ToDo: tdf#142798. Get the correct margin and activate the
test then.

testTextframeGradient in ooxmlexport2.cxx. I didn't find any reference
for a default value. The test is not reliable, I get both 316 and 318
as actual value. Handling of shadow in VML shapes is buggy, the values
for margin and shadow are wrong anyway. Reports are e.g. tdf#142486,
tdf#142558. For now I have added a tolerance of 2.

testDMLGroupShapeChildPosition in ooxmlexport6.cxx. The accuracy has
become better. After reload we get the same values as before.

testEffectExtent in ooxmlexport.cxx. tdf#142805. I have disabled the
test, because the image is not loaded at all, and therefore it makes
no sense to test a margin of it. And you can only test the sum of
distL and effectExtent l, because LO has only one property
'LeftMargin' for it.

testEffectExtentInline in ooxmlexport.cxx. To get the same vertical
alignment as in Word, it would be necessary to have negative margins,
but those are not implemented yet. tdf#141880. Currently the patch
contains a heuristic to detect unchanged objects and write the
grab-Bag values then.

testEffectExtentLineWidth in ooxmlexport16.cxx. I have changed the
expected value from 508 to 506. That is still away from the to be
fixed faulty 561. It is a VML shape and import of connectors in
VML shapes is faulty.

testRelorientation in ooxmlexport4.cxx. Changed to 8662, the original
problem is still fixed. I don't know the reason for the difference to
the values from file.

Change-Id: I28f156637f6ae64975cf2917f0e5cc89e689aff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115668
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index de8c2928ccba..72d7b6d67a37 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1736,14 +1736,14 @@ void DrawingML::WriteTransformation(const Reference< XShape >& xShape, const too
                           XML_rot, sax_fastparser::UseIf(OString::number(nRotation), nRotation % 21600000 != 0));
 
     sal_Int32 nLeft = rRect.Left();
-    sal_Int32 nChildLeft = nLeft;
     sal_Int32 nTop = rRect.Top();
-    sal_Int32 nChildTop = nTop;
     if (GetDocumentType() == DOCUMENT_DOCX && !m_xParent.is())
     {
         nLeft = 0;
         nTop = 0;
     }
+    sal_Int32 nChildLeft = nLeft;
+    sal_Int32 nChildTop = nTop;
 
     mpFS->singleElementNS(XML_a, XML_off,
         XML_x, OString::number(oox::drawingml::convertHmmToEmu(nLeft)),