From 2abe9837deee3823c7928a76b5b2f94f1464f1a3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Wed, 13 May 2020 17:59:34 +0200
Subject: [PATCH] DOCX import: fix interaction between the crop and the wrap
 polygon of images

Word first applies the crop, then applies the wrap polygon on the
remaining visible part of the image.

Writer applies the crop on the original bitmap, and even has explicit
code to make sure the uncropped bitmap is used for the wrap polygon, see
how SwFlyFrame::GetContour() calls SwNoTextFrame::GetGrfArea(), which
will extend the resulting size based on cropping.

Fix the problem by moving and scaling the wrap polygon, so it ends up
where it would in Word.

Also adapt testFdo76803, which had a similar crop+wrap polygon case, but
the different there is quite small.

Change-Id: Iab2adaa81a33eb04e1806b17ed129ac50f5d2aa3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94149
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx      |  16 +++++-----
 .../CppunitTest_writerfilter_dmapper.mk       |   1 +
 .../qa/cppunittests/dmapper/GraphicImport.cxx |  30 ++++++++++++++++++
 .../dmapper/data/wrap-poly-crop.docx          | Bin 0 -> 15018 bytes
 writerfilter/source/dmapper/GraphicImport.cxx |  11 +++++++
 .../source/dmapper/WrapPolygonHandler.cxx     |  18 +++++++++++
 .../source/dmapper/WrapPolygonHandler.hxx     |   7 ++++
 7 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 14d0d2797f8b..48de70ea00b6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -981,17 +981,17 @@ DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
 
     CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), aPolygon.count());
 
-    CPPUNIT_ASSERT_EQUAL(double(-163), aPolygon.getB2DPoint(0).getX());
-    CPPUNIT_ASSERT_EQUAL(double(0), aPolygon.getB2DPoint(0).getY());
+    CPPUNIT_ASSERT_EQUAL(double(-162), aPolygon.getB2DPoint(0).getX());
+    CPPUNIT_ASSERT_EQUAL(double(-35), aPolygon.getB2DPoint(0).getY());
 
-    CPPUNIT_ASSERT_EQUAL(double(-163), aPolygon.getB2DPoint(1).getX());
-    CPPUNIT_ASSERT_EQUAL(double(3661), aPolygon.getB2DPoint(1).getY());
+    CPPUNIT_ASSERT_EQUAL(double(-162), aPolygon.getB2DPoint(1).getX());
+    CPPUNIT_ASSERT_EQUAL(double(3510), aPolygon.getB2DPoint(1).getY());
 
-    CPPUNIT_ASSERT_EQUAL(double(16987), aPolygon.getB2DPoint(2).getX());
-    CPPUNIT_ASSERT_EQUAL(double(3661), aPolygon.getB2DPoint(2).getY());
+    CPPUNIT_ASSERT_EQUAL(double(16892), aPolygon.getB2DPoint(2).getX());
+    CPPUNIT_ASSERT_EQUAL(double(3510), aPolygon.getB2DPoint(2).getY());
 
-    CPPUNIT_ASSERT_EQUAL(double(16987), aPolygon.getB2DPoint(3).getX());
-    CPPUNIT_ASSERT_EQUAL(double(0), aPolygon.getB2DPoint(3).getY());
+    CPPUNIT_ASSERT_EQUAL(double(16892), aPolygon.getB2DPoint(3).getX());
+    CPPUNIT_ASSERT_EQUAL(double(-35), aPolygon.getB2DPoint(3).getY());
 }
 
 DECLARE_OOXMLIMPORT_TEST(testUnbalancedColumnsCompat, "unbalanced-columns-compat.docx")
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk b/writerfilter/CppunitTest_writerfilter_dmapper.mk
index 270844557d3b..c29b3b9e1c39 100644
--- a/writerfilter/CppunitTest_writerfilter_dmapper.mk
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
+    basegfx \
     comphelper \
     cppu \
     oox \
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index 590a93273e92..7648d9e9420d 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -15,6 +15,9 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
+#include <com/sun/star/drawing/PointSequenceSequence.hpp>
+
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 using namespace ::com::sun::star;
 
@@ -134,6 +137,33 @@ CPPUNIT_TEST_FIXTURE(Test, testRelfromhInsidemargin)
     xShape->getPropertyValue("PageToggle") >>= bPageToggle;
     CPPUNIT_ASSERT(bPageToggle);
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testWrapPolyCrop)
+{
+    OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "wrap-poly-crop.docx";
+    getComponent() = loadFromDesktop(aURL);
+    uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+    uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
+    uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY);
+    drawing::PointSequenceSequence aContour;
+    xShape->getPropertyValue("ContourPolyPolygon") >>= aContour;
+    auto aPolyPolygon = basegfx::utils::UnoPointSequenceSequenceToB2DPolyPolygon(aContour);
+    CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aPolyPolygon.count());
+    auto aPolygon = aPolyPolygon.getB2DPolygon(0);
+    CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), aPolygon.count());
+
+    // Ideally this would be 2352, because the graphic size in mm100, using the graphic's DPI is
+    // 10582, the lower 33% of the graphic is cropped, and the wrap polygon covers the middle third
+    // of the area vertically. Which means 10582*2/3 = 7054.67 is the cropped height, and the top of
+    // the middle third is 2351.55.
+    //
+    // Without the accompanying fix in place, this test would have failed with:
+    // - Expected: 2361
+    // - Actual  : 3542
+    // i.e. the wrap polygon covered a larger-than-correct area, which end the end means 3 lines
+    // were wrapping around the image, not only 2 as Word does it.
+    CPPUNIT_ASSERT_EQUAL(2361., aPolygon.getB2DPoint(0).getY());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx b/writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx
new file mode 100644
index 0000000000000000000000000000000000000000..1835a130d7402314e703ea14ea401fa02d94a613
GIT binary patch
literal 15018
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
Vg#z_pP?{#_YYH*~X0DfC{|n~rEu#Pc

literal 0
HcmV?d00001

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 74ce96871499..73333b23e790 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1404,6 +1404,17 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
                         pCorrected = m_pImpl->mpWrapPolygon->correctWordWrapPolygonPixel(aGraphicSize);
                     }
                 }
+
+                text::GraphicCrop aGraphicCrop;
+                xShapeProps->getPropertyValue("GraphicCrop") >>= aGraphicCrop;
+                if (aGraphicCrop.Top != 0 || aGraphicCrop.Bottom != 0 || aGraphicCrop.Left != 0
+                    || aGraphicCrop.Right != 0)
+                {
+                    // Word's wrap polygon deals with a canvas which has the size of the already
+                    // cropped graphic, correct our polygon to have the same render result.
+                    pCorrected = pCorrected->correctCrop(aGraphicSize, aGraphicCrop);
+                }
+
                 if (pCorrected)
                 {
                     aContourPolyPolygon <<= pCorrected->getPointSequenceSequence();
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 7d2526c0bbaf..00b8699972bc 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/drawing/PointSequence.hpp>
+#include <com/sun/star/text/GraphicCrop.hpp>
 #include <comphelper/sequence.hxx>
 
 #include <ooxml/resourceids.hxx>
@@ -135,6 +136,23 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygonPixel(const awt::Size
     return pResult;
 }
 
+WrapPolygon::Pointer_t WrapPolygon::correctCrop(const awt::Size& rGraphicSize,
+                                                const text::GraphicCrop& rGraphicCrop)
+{
+    WrapPolygon::Pointer_t pResult;
+
+    Fraction aScaleX(rGraphicSize.Width - rGraphicCrop.Left - rGraphicCrop.Right,
+                     rGraphicSize.Width);
+    Fraction aScaleY(rGraphicSize.Height - rGraphicCrop.Top - rGraphicCrop.Bottom,
+                     rGraphicSize.Height);
+    pResult = scale(aScaleX, aScaleY);
+
+    awt::Point aMove(rGraphicCrop.Left, rGraphicCrop.Top);
+    pResult = pResult->move(aMove);
+
+    return pResult;
+}
+
 drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
 {
     drawing::PointSequenceSequence aPolyPolygon(1);
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 6b8b458e616c..e9e58dc0907b 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -25,6 +25,11 @@
 #include <tools/fract.hxx>
 #include <vector>
 
+namespace com::sun::star::text
+{
+struct GraphicCrop;
+}
+
 namespace writerfilter {
 namespace dmapper {
 
@@ -51,6 +56,8 @@ public:
     WrapPolygon::Pointer_t scale(const Fraction & rFractionX, const Fraction & rFractionY);
     WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize);
     WrapPolygon::Pointer_t correctWordWrapPolygonPixel(const css::awt::Size & rSrcSize);
+    WrapPolygon::Pointer_t correctCrop(const css::awt::Size& rGraphicSize,
+                                       const css::text::GraphicCrop& rGraphicCrop);
     css::drawing::PointSequenceSequence getPointSequenceSequence() const;
 };