[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source sw/qa

[Vasily Melenchuk]

 svx/source/customshapes/EnhancedCustomShape2d.cxx |   17 +++++++-
 sw/qa/extras/ooxmlimport/data/tdf100072.docx      |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx          |   44 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

New commits:
commit 9c3100a4b9f258a7dc0aff93bc01fa39f7501d2c
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Mon May 15 13:41:14 2017 +0300

    tdf#100072 zero height of shape's path was causing geometry errors
    
    DOCX custom geometry shape's path width and height are now used
    independently for scaling calculations.
    
    Reviewed-on: https://gerrit.libreoffice.org/37639
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5477f7274e4df1210298c0f503a54eabc0f06bfc)
    
    plus:
    
    tdf#100072 extra test for DOCX shape import with zero height
    
    Corresponding bug is already fixed in tdf#107104. However created
    tests do care only for width, but not for height, like we have in
    this testcase.
    
    Reviewed-on: https://gerrit.libreoffice.org/37538
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit cffc5a04661fc0a84dff9fa5da954236d88a8b38)
    
    Change-Id: If5d5499f402379df125b0f31dd071ca51b2553f1
    Reviewed-on: https://gerrit.libreoffice.org/38224
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 6a5e9e9c87e9..85886b22ec3e 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -651,10 +651,23 @@ void EnhancedCustomShape2d::SetPathSize( sal_Int32 nIndex )
             "svx",
             "ooxml shape, path width: " << nCoordWidth << " height: "
                 << nCoordHeight);
+
+        // Try to set up scale separately, if given only width or height
+        // This is possible case in OOXML when only width or height is non-zero
         if ( nCoordWidth == 0 )
-            fXScale = 1.0;
+        {
+            if ( nWidth )
+                fXScale = (double)aLogicRect.GetWidth() / (double)nWidth;
+            else
+                fXScale = 1.0;
+        }
         if ( nCoordHeight == 0 )
-            fYScale = 1.0;
+        {
+            if ( nHeight )
+                fYScale = (double)aLogicRect.GetHeight() / (double)nHeight;
+            else
+                fYScale = 1.0;
+        }
     }
     if ( (sal_uInt32)nXRef != 0x80000000 && aLogicRect.GetHeight() )
     {
diff --git a/sw/qa/extras/ooxmlimport/data/tdf100072.docx b/sw/qa/extras/ooxmlimport/data/tdf100072.docx
new file mode 100644
index 000000000000..02b885b9aafa
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf100072.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 989d5fb34f34..32ec82962ed9 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
+#include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -59,6 +60,7 @@
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/awt/CharSet.hpp>
+#include <test/mtfxmldump.hxx>
 
 class Test : public SwModelTestBase
 {
@@ -1375,6 +1377,48 @@ DECLARE_OOXMLIMPORT_TEST(testTdf96218, "tdf96218.docx")
     CPPUNIT_ASSERT(!getProperty<bool>(getShape(1), "IsFollowingTextFlow"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf100072, "tdf100072.docx")
+{
+    uno::Reference<drawing::XShape> xShape = getShape(1);
+
+    // Ensure that shape has non-zero height
+    CPPUNIT_ASSERT(xShape->getSize().Height > 0);
+
+    // Ensure that shape left corner is within page (positive)
+    CPPUNIT_ASSERT(xShape->getPosition().X > 0);
+
+    // Save the first shape to a metafile.
+    uno::Reference<drawing::XGraphicExportFilter> xGraphicExporter = drawing::GraphicExportFilter::create(comphelper::getProcessComponentContext());
+    uno::Reference<lang::XComponent> xSourceDoc(xShape, uno::UNO_QUERY);
+    xGraphicExporter->setSourceDocument(xSourceDoc);
+
+    SvMemoryStream aStream;
+    uno::Reference<io::XOutputStream> xOutputStream(new utl::OStreamWrapper(aStream));
+    uno::Sequence<beans::PropertyValue> aDescriptor =
+    {
+        beans::PropertyValue("OutputStream", sal_Int32(0), uno::makeAny(xOutputStream), beans::PropertyState_DIRECT_VALUE),
+        beans::PropertyValue("FilterName", sal_Int32(0), uno::makeAny(OUString("SVM")), beans::PropertyState_DIRECT_VALUE)
+    };
+    xGraphicExporter->filter(aDescriptor);
+    aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+    // Read it back and dump it as an XML file.
+    Graphic aGraphic;
+    ReadGraphic(aStream, aGraphic);
+    const GDIMetaFile& rMetaFile = aGraphic.GetGDIMetaFile();
+    MetafileXmlDump dumper;
+    xmlDocPtr pXmlDoc = dumper.dumpAndParse(rMetaFile);
+
+    // Get first polyline rightside x coordinate
+    sal_Int32 nFirstEnd = getXPath(pXmlDoc, "/metafile/polyline[1]/point[2]", "x").toInt32();
+
+    // Get last stroke x coordinate
+    sal_Int32 nSecondEnd = getXPath(pXmlDoc, "/metafile/polyline[last()]/point[2]", "x").toInt32();
+
+    // Assert that the difference is less than half point.
+    CPPUNIT_ASSERT_MESSAGE("Shape line width does not match", abs(nFirstEnd - nSecondEnd) < 10);
+}
+
 // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
 
 CPPUNIT_PLUGIN_IMPLEMENT();