tdf#90338 tdf#84254 DrawingML export fix

Change-Id: I610d8099f057a2a34a1f9573d8ac16b5b8da9fc7
Reviewed-on: https://gerrit.libreoffice.org/15918Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 481c185e)

include/oox/export/drawingml.hxx

@@ -177,6 +177,7 @@ public:
 
     void WritePresetShape( const char* pShape );
     void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp );
+    void WriteCustomGeometry( css::uno::Reference<css::drawing::XShape> rXShape );
     void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon );
     void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet );
     void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );

oox/source/export/shapes.cxx

@@ -291,6 +291,7 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
     static
 #endif
     const std::initializer_list<OUStringLiteral> vBlacklist = {
+        OUStringLiteral("ellipse"),
         OUStringLiteral("ring"),
         OUStringLiteral("can"),
         OUStringLiteral("cube"),
@@ -478,17 +479,13 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
     else if( bHasHandles )
         bCustGeom = true;
 
-    if (bCustGeom && pShape)
+    if (bHasHandles && bCustGeom && pShape)
     {
-        basegfx::B2DPolyPolygon aB2DPolyPolygon = pShape->GetLineGeometry(true);
-        tools::PolyPolygon aPolyPolygon;
-        for( sal_uInt32 i = 0; i < aB2DPolyPolygon.count(); ++i )
-        {
-            basegfx::B2DPolygon aB2DPolygon = aB2DPolyPolygon.getB2DPolygon(i);
-            aPolyPolygon.Insert( Polygon( aB2DPolygon ), POLYPOLY_APPEND );
-        }
-
-        WritePolyPolygon( aPolyPolygon );
+        WritePolyPolygon( tools::PolyPolygon( pShape->GetLineGeometry(true) ) );
+    }
+    else if (bCustGeom && pShape)
+    {
+        WriteCustomGeometry( xShape );
     }
     else // preset geometry
     {

sd/qa/unit/import-tests.cxx

@@ -192,6 +192,7 @@ void SdImportTest::testDocumentLayout()
         { "fdo71434.pptx", "xml/fdo71434_", PPTX, -1 },
         { "n902652.pptx", "xml/n902652_", PPTX, -1 },
         { "tdf90403.pptx", "xml/tdf90403_", PPTX, -1 },
+        { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX },
         // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example
     };