tdf106792 Get rid of SvxShapePolyPolygonBezier

SvxShapePolyPolygonBezier was an implementation for the UNO
Shape group of polygons with bezier parts (filled/unfilled/
closed/open), e.g. com.sun.star.drawing.OpenBezierShape.
It was differing from SvxShapePolyPolygon just by supporting
drawing::PolyPolygonBezierCoords instead of the simple
drawing::PointSequenceSequence and some details.
This leads to problems - the ShapeType *does change* e.g.
when you edit a non-bezier Shape in Draw/Impress and change
parts to curve (also when closing, see ShapeTypes above).
This is why SvxShape::getShapeType() already detects this
identifier by using thze internal ShapePolyType (e.g.
OBJ_PATHLINE).
So there is no reason to have two separate UNO API imple-
mentations for sthe same type of SvxShape at all. Get rid
of the extra one and unify this implementation detail.
Also cleaned up double basegfx tooling for conversions of
UNO API Poly/bezier data and B2DPolygon.
Adapted test for "tdf113946.docx", see comment there.
Adapted test for "tdf90097.rtf", see comment there. Also
needed to use the Linux values, also check comment there.
Adapted test for "tdf105127.docx", see comment there.
Adapted test for "tdf85232.docx", see comment there.
Had to fic a problem with test for "tdf96674.docx"- the
adaption of the RotateAngle for line objects goes havoc
together with the UNO API when scaling is involved. That
old aGeo rotate stuff just kills the existing rotation due
to numerical inprecise stuff. The UNP API - in trying not
just to apply a rptation, but manipulate the existing one
then goes wrong in not re-getting the current rotation
value anymore. ARGH! This is the original reason for the
ols tdf#96674 task - i doubt that the additional code to
make a line not exactly hor/ver is needed.
Checked and it is not needed, thus removed the change from
tdf#96674 in shape.cxx.

Change-Id: I2bb8d4cfe33fee3671f3dad60e5c18609a394f9d
Reviewed-on: https://gerrit.libreoffice.org/56614
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>

basegfx/Library_basegfx.mk

@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
     basegfx/source/tools/stringconversiontools \
     basegfx/source/tools/tools \
     basegfx/source/tools/unopolypolygon \
-    basegfx/source/tools/unotools \
     basegfx/source/tools/zoomtools \
     basegfx/source/tuple/b2dtuple \
     basegfx/source/tuple/b2i64tuple \

include/basegfx/utils/unotools.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_BASEGFX_UTILS_UNOTOOLS_HXX
-#define INCLUDED_BASEGFX_UTILS_UNOTOOLS_HXX
-
-#include <cppuhelper/basemutex.hxx>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/rendering/FillRule.hpp>
-#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
-#include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-
-
-namespace basegfx
-{
-class B2DPolyPolygon;
-
-namespace unotools
-{
-    /// @throws css::lang::IllegalArgumentException
-    BASEGFX_DLLPUBLIC B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const css::drawing::PolyPolygonBezierCoords& rSourcePolyPolygon);
-
-    BASEGFX_DLLPUBLIC void b2DPolyPolygonToPolyPolygonBezier( const B2DPolyPolygon& rPolyPoly,
-                                            css::drawing::PolyPolygonBezierCoords& rRetval );
-}
-}
-
-#endif // INCLUDED_BASEGFX_UTILS_UNOTOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svx/unoprov.hxx

@@ -55,28 +55,27 @@ public:
 #define SVXMAP_DIMENSIONING         2
 #define SVXMAP_CIRCLE               3
 #define SVXMAP_POLYPOLYGON          4
-#define SVXMAP_POLYPOLYGONBEZIER    5
-#define SVXMAP_GRAPHICOBJECT        6
-#define SVXMAP_3DSCENEOBJECT        7
-#define SVXMAP_3DCUBEOBJECT         8
-#define SVXMAP_3DSPHEREOBJECT       9
-#define SVXMAP_3DLATHEOBJECT        10
-#define SVXMAP_3DEXTRUDEOBJECT      11
-#define SVXMAP_3DPOLYGONOBJECT      12
-#define SVXMAP_ALL                  13
-#define SVXMAP_GROUP                14
-#define SVXMAP_CAPTION              15
-#define SVXMAP_OLE2                 16
-#define SVXMAP_PLUGIN               17
-#define SVXMAP_FRAME                18
-#define SVXMAP_APPLET               19
-#define SVXMAP_CONTROL              20
-#define SVXMAP_TEXT                 21
-#define SVXMAP_CUSTOMSHAPE          22
-#define SVXMAP_MEDIA                23
-#define SVXMAP_TABLE                24
-#define SVXMAP_PAGE                 25
-#define SVXMAP_END                  26  // last+1 !
+#define SVXMAP_GRAPHICOBJECT        5
+#define SVXMAP_3DSCENEOBJECT        6
+#define SVXMAP_3DCUBEOBJECT         7
+#define SVXMAP_3DSPHEREOBJECT       8
+#define SVXMAP_3DLATHEOBJECT        9
+#define SVXMAP_3DEXTRUDEOBJECT      10
+#define SVXMAP_3DPOLYGONOBJECT      11
+#define SVXMAP_ALL                  12
+#define SVXMAP_GROUP                13
+#define SVXMAP_CAPTION              14
+#define SVXMAP_OLE2                 15
+#define SVXMAP_PLUGIN               16
+#define SVXMAP_FRAME                17
+#define SVXMAP_APPLET               18
+#define SVXMAP_CONTROL              19
+#define SVXMAP_TEXT                 20
+#define SVXMAP_CUSTOMSHAPE          21
+#define SVXMAP_MEDIA                22
+#define SVXMAP_TABLE                23
+#define SVXMAP_PAGE                 24
+#define SVXMAP_END                  25  // last+1 !
 
 /**
  * SvxUnoPropertyMapProvider

include/svx/unoshape.hxx

@@ -615,9 +615,6 @@ public:
 ***********************************************************************/
 class SvxShapePolyPolygon : public SvxShapeText
 {
-private:
-    css::drawing::PolygonKind mePolygonKind;
-
 protected:
     using SvxUnoTextRangeBase::setPropertyValue;
     using SvxUnoTextRangeBase::getPropertyValue;
@@ -626,10 +623,13 @@ protected:
     virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
     virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
 
+    // local helper to detect PolygonKind from SdrObject::GetObjIdentifier()
+    css::drawing::PolygonKind GetPolygonKind() const;
+
 public:
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::beans::PropertyVetoException
-    SvxShapePolyPolygon( SdrObject* pObj , css::drawing::PolygonKind eNew );
+    SvxShapePolyPolygon( SdrObject* pObj );
     virtual ~SvxShapePolyPolygon() throw() override;
 
     // Local support functions
@@ -642,32 +642,6 @@ public:
 *                                                                      *
 ***********************************************************************/
 
-class SvxShapePolyPolygonBezier : public SvxShapeText
-{
-private:
-    css::drawing::PolygonKind mePolygonKind;
-
-protected:
-    using SvxUnoTextRangeBase::setPropertyValue;
-    using SvxUnoTextRangeBase::getPropertyValue;
-
-public:
-    // override these for special property handling in subcasses. Return true if property is handled
-    virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override;
-    virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override;
-
-    SvxShapePolyPolygonBezier(SdrObject* pObj, css::drawing::PolygonKind eNew);
-    virtual ~SvxShapePolyPolygonBezier() throw() override;
-
-    // Local support functions
-    /// @throws css::uno::RuntimeException
-    void SetPolygon(const basegfx::B2DPolyPolygon & rNew);
-    basegfx::B2DPolyPolygon GetPolygon() const throw();
-};
-
-/***********************************************************************
-*                                                                      *
-***********************************************************************/
 class SvxGraphicObject : public SvxShapeText
 {
 protected:

oox/source/drawingml/shape.cxx

@@ -579,17 +579,10 @@ Reference< XShape > const & Shape::createAndInsert(
         bool bIsWriter = xModelInfo->supportsService("com.sun.star.text.TextDocument");
         for( i = 0; i < nNumPoints; ++i )
         {
-            basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) );
+            const basegfx::B2DPoint aPoint( aPoly.getB2DPoint( i ) );
 
-            // Guard against zero width or height.
-            if (i)
-            {
-                const basegfx::B2DPoint& rPreviousPoint = aPoly.getB2DPoint(i - 1);
-                if (aPoint.getX() - rPreviousPoint.getX() == 0)
-                    aPoint.setX(aPoint.getX() + 1);
-                if (aPoint.getY() - rPreviousPoint.getY() == 0)
-                    aPoint.setY(aPoint.getY() + 1);
-            }
+            // tdf#106792 Not needed anymore due to the change in SdrPathObj::NbcResize:
+            // tdf#96674: Guard against zero width or height.
 
             if (bIsWriter && bInGroup)
                 // Writer's draw page is in twips, and these points get passed

qadevOOo/Jar_OOoRunner.mk

@@ -1155,7 +1155,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning \
     qadevOOo/tests/java/mod/_svx/SvxShapeGroup \
     qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon \
-    qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier \
     qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules \
     qadevOOo/tests/java/mod/_svx/SvxUnoText \
     qadevOOo/tests/java/mod/_svx/SvxUnoTextContent \

solenv/clang-format/blacklist

@@ -5881,7 +5881,6 @@ include/basegfx/utils/lerp.hxx
 include/basegfx/utils/rectcliptools.hxx
 include/basegfx/utils/tools.hxx
 include/basegfx/utils/unopolypolygon.hxx
-include/basegfx/utils/unotools.hxx
 include/basegfx/utils/zoomtools.hxx
 include/basegfx/vector/b2dsize.hxx
 include/basegfx/vector/b2dvector.hxx

svx/source/customshapes/EnhancedCustomShapeEngine.cxx

@@ -49,7 +49,6 @@
 #include <svx/svditer.hxx>
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/utils/unotools.hxx>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -484,7 +483,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
                 SdrObject::Free( pNewObj );
             }
             SdrObject::Free( pObj );
-            basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( aPolyPolygon,
+            basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( aPolyPolygon,
                                                                   aPolyPolygonBezierCoords );
         }
     }

svx/source/svdraw/svdoashp.cxx

@@ -81,7 +81,6 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/utils/unotools.hxx>
 #include <svdobjplusdata.hxx>
 
 using namespace ::com::sun::star;
@@ -562,7 +561,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const bool bBezierAl
         css::drawing::PolyPolygonBezierCoords aBezierCoords = xCustomShapeEngine->getLineGeometry();
         try
         {
-            aRetval = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( aBezierCoords );
+            aRetval = basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( aBezierCoords );
             if ( !bBezierAllowed && aRetval.areControlPointsUsed())
             {
                 aRetval = basegfx::utils::adaptiveSubdivideByAngle(aRetval);

svx/source/svdraw/svdopath.cxx

@@ -2312,6 +2312,20 @@ void SdrPathObj::NbcMove(const Size& rSiz)
 
 void SdrPathObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
+    const double fResizeX(xFact);
+    const double fResizeY(yFact);
+
+    if(basegfx::fTools::equal(fResizeX, 1.0) && basegfx::fTools::equal(fResizeY, 1.0))
+    {
+        // tdf#106792 avoid numerical unprecisions: If both scale factors are 1.0, do not
+        // manipulate at all - that may change aGeo rapidly (and wrongly) in
+        // SdrTextObj::NbcResize. Combined with the UNO API trying to not 'apply'
+        // a rotation but to manipulate the existing one, this is fatal. So just
+        // avoid this error as long as we have to deal with unprecise geometry
+        // manipulations
+        return;
+    }
+
     basegfx::B2DHomMatrix aTrans(basegfx::utils::createTranslateB2DHomMatrix(-rRef.X(), -rRef.Y()));
     aTrans = basegfx::utils::createScaleTranslateB2DHomMatrix(
         double(xFact), double(yFact), rRef.X(), rRef.Y()) * aTrans;

svx/source/unodraw/XPropertyTable.cxx

@@ -39,7 +39,7 @@
 #include <svx/unoapi.hxx>
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/utils/unotools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 using namespace com::sun::star;
 using namespace ::cppu;
@@ -315,7 +315,7 @@ uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyL
 uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw()
 {
     drawing::PolyPolygonBezierCoords aBezier;
-    basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( static_cast<const XLineEndEntry*>(pEntry)->GetLineEnd(),
+    basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( static_cast<const XLineEndEntry*>(pEntry)->GetLineEnd(),
                                                           aBezier );
     return uno::Any(aBezier);
 }
@@ -328,7 +328,7 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString&
 
     basegfx::B2DPolyPolygon aPolyPolygon;
     if( pCoords->Coordinates.getLength() > 0 )
-        aPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
+        aPolyPolygon = basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( *pCoords );
 
     // #86265# make sure polygon is closed
     aPolyPolygon.setClosed(true);

svx/source/unodraw/unopage.cxx

@@ -649,7 +649,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent
                     pRet = new SvxShapeGroup( pObj, mpPage );
                     break;
                 case OBJ_LINE:
-                    pRet = new SvxShapePolyPolygon( pObj , PolygonKind_LINE );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_RECT:
                     pRet = new SvxShapeRect( pObj );
@@ -661,24 +661,24 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent
                     pRet = new SvxShapeCircle( pObj );
                     break;
                 case OBJ_POLY:
-                    pRet = new SvxShapePolyPolygon( pObj , PolygonKind_POLY );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_PLIN:
-                    pRet = new SvxShapePolyPolygon( pObj , PolygonKind_PLIN );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_SPLNLINE:
                 case OBJ_PATHLINE:
-                    pRet = new SvxShapePolyPolygonBezier( pObj , PolygonKind_PATHLINE );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_SPLNFILL:
                 case OBJ_PATHFILL:
-                    pRet = new SvxShapePolyPolygonBezier( pObj , PolygonKind_PATHFILL );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_FREELINE:
-                    pRet = new SvxShapePolyPolygonBezier( pObj , PolygonKind_FREELINE );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_FREEFILL:
-                    pRet = new SvxShapePolyPolygonBezier( pObj , PolygonKind_FREEFILL );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_CAPTION:
                     pRet = new SvxShapeCaption( pObj );
@@ -754,10 +754,10 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInvent
                     pRet = new SvxShapeConnector( pObj );
                     break;
                 case OBJ_PATHPOLY:
-                    pRet = new SvxShapePolyPolygon( pObj , PolygonKind_PATHPOLY );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_PATHPLIN:
-                    pRet = new SvxShapePolyPolygon( pObj , PolygonKind_PATHPLIN );
+                    pRet = new SvxShapePolyPolygon( pObj );
                     break;
                 case OBJ_PAGE:
                 {

svx/source/unodraw/unoprov.cxx

@@ -175,30 +175,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
         { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PointSequenceSequence>::get(), 0, 0 },
         SPECIAL_POLYGON_PROPERTIES
         SPECIAL_POLYPOLYGON_PROPERTIES
-        FILL_PROPERTIES
-        LINE_PROPERTIES
-        LINE_PROPERTIES_START_END
-        SHAPE_DESCRIPTOR_PROPERTIES
-        MISC_OBJ_PROPERTIES
-        LINKTARGET_PROPERTIES
-        SHADOW_PROPERTIES
-        TEXT_PROPERTIES
-        // #FontWork#
-        FONTWORK_PROPERTIES
-        { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(),        0,     0},
-        { OUString(), 0, css::uno::Type(), 0, 0 }
-    };
-
-    return aPolyPolygonPropertyMap_Impl;
-}
-
-SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
-{
-    static SfxItemPropertyMapEntry const aPolyPolygonBezierPropertyMap_Impl[] =
-    {
-        { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get(), 0, 0 },
-        SPECIAL_POLYGON_PROPERTIES
         SPECIAL_POLYPOLYGONBEZIER_PROPERTIES
         FILL_PROPERTIES
         LINE_PROPERTIES
@@ -215,7 +191,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap()
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };
 
-    return aPolyPolygonBezierPropertyMap_Impl;
+    return aPolyPolygonPropertyMap_Impl;
 }
 
 SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
@@ -916,7 +892,6 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPro
             case SVXMAP_DIMENSIONING: aMapArr[SVXMAP_DIMENSIONING]=ImplGetSvxDimensioningPropertyMap(); break;
             case SVXMAP_CIRCLE: aMapArr[SVXMAP_CIRCLE]=ImplGetSvxCirclePropertyMap(); break;
             case SVXMAP_POLYPOLYGON: aMapArr[SVXMAP_POLYPOLYGON]=ImplGetSvxPolyPolygonPropertyMap(); break;
-            case SVXMAP_POLYPOLYGONBEZIER: aMapArr[SVXMAP_POLYPOLYGONBEZIER]=ImplGetSvxPolyPolygonBezierPropertyMap(); break;
             case SVXMAP_GRAPHICOBJECT: aMapArr[SVXMAP_GRAPHICOBJECT]=ImplGetSvxGraphicObjectPropertyMap(); break;
             case SVXMAP_3DSCENEOBJECT: aMapArr[SVXMAP_3DSCENEOBJECT]=ImplGetSvx3DSceneObjectPropertyMap(); break;
             case SVXMAP_3DCUBEOBJECT: aMapArr[SVXMAP_3DCUBEOBJECT]=ImplGetSvx3DCubeObjectPropertyMap(); break;

svx/source/unodraw/unoshape.cxx

@@ -79,7 +79,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/utils/unotools.hxx>
 #include "gluepts.hxx"
 #include "shapeimpl.hxx"
 #include <sal/log.hxx>
@@ -2729,7 +2728,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
                     // Reintroduction of fix for issue #i59051# (#i108851#)
                     ForceMetricTo100th_mm( aPolyPoly );
                     drawing::PolyPolygonBezierCoords aRetval;
-                    basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( aPolyPoly, aRetval);
+                    basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( aPolyPoly, aRetval);
                     rValue <<= aRetval;
                     break;
                 }

svx/source/xoutdev/xattr.cxx

@@ -57,7 +57,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/utils/unotools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <unotools/intlwrapper.hxx>
 #include <vcl/gradient.hxx>
 
@@ -1020,7 +1020,7 @@ bool XLineStartItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) cons
     else
     {
         css::drawing::PolyPolygonBezierCoords aBezier;
-        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
+        basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
 
@@ -1047,7 +1047,7 @@ bool XLineStartItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 
             if( pCoords->Coordinates.getLength() > 0 )
             {
-                maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
+                maPolyPolygon = basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( *pCoords );
                 // #i72807# close line start/end polygons hard
                 // maPolyPolygon.setClosed(true);
             }
@@ -1551,7 +1551,7 @@ bool XLineEndItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
     else
     {
         css::drawing::PolyPolygonBezierCoords aBezier;
-        basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
+        basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
     return true;
@@ -1577,7 +1577,7 @@ bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 
             if( pCoords->Coordinates.getLength() > 0 )
             {
-                maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
+                maPolyPolygon = basegfx::utils::UnoPolyPolygonBezierCoordsToB2DPolyPolygon( *pCoords );
                 // #i72807# close line start/end polygons hard
                 // maPolyPolygon.setClosed(true);
             }

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

@@ -645,8 +645,12 @@ DECLARE_OOXMLIMPORT_TEST(testBnc779620, "bnc779620.docx")
 DECLARE_OOXMLIMPORT_TEST(testTdf105127, "tdf105127.docx")
 {
     auto aPolyPolygon = getProperty<drawing::PolyPolygonBezierCoords>(getShape(1), "PolyPolygonBezier");
-    // This was 1910, the shape was rendered upside down.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3257), aPolyPolygon.Coordinates[0][0].Y);
+    // tdf#106792 These values were wrong all the time due to a missing
+    // conversion in SvxShapePolyPolygon::getPropertyValueImpl. There was no
+    // ForceMetricTo100th_mm -> the old results were in twips due to the
+    // object residing in Writer. The UNO API by definition is in 100thmm,
+    // thus I will correct the value here.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5744), aPolyPolygon.Coordinates[0][0].Y); // was: 3257
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf105143, "tdf105143.docx")
@@ -1063,8 +1067,17 @@ DECLARE_OOXMLIMPORT_TEST(testTdf85232, "tdf85232.docx")
     uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xShape, uno::UNO_QUERY);
     // Make sure we're not testing the ellipse child.
     CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.LineShape"), xShapeDescriptor->getShapeType());
-    // This was 2900: horizontal position of the line was incorrect, the 3 children were not connected visually.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2267), xShape->getPosition().X);
+
+    // tdf#106792 checked that during load of tdf85232.docx the method
+    // SvxShapePolyPolygon::setPropertyValueImpl is used three times. In
+    // that method, a call to ForceMetricToItemPoolMetric was missing so
+    // that the import did not convert the input values from 100thmm
+    // to twips what is needed due to the object residing in Writer. The
+    // UNO API by definition is in 100thmm. Result is that in SwXShape::getPosition
+    // the offset (aOffset) now is (0, 0) instead of an existing offset in
+    // the load of the document before (what is plausible for a GroupObject).
+    // Thus, I will adapt the result value here to the now (hopefully) correct one.
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1630), xShape->getPosition().X); // was: 2267
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf95755, "tdf95755.docx")

sw/qa/extras/ooxmlimport/ooxmlimport2.cxx

@@ -189,7 +189,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf113182, "tdf113182.docx") { CPPUNIT_ASSERT_EQUAL
 DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
 {
     OUString aTop = parseDump("/root/page/body/txt/anchored/SwAnchoredDrawObject/bounds", "top");
-    CPPUNIT_ASSERT_EQUAL(OUString("1696"), aTop);
+    // tdf#106792 Checked loading of tdf113946.docx. Before the change, the expected
+    // value of this test was "1696". Opening the file shows a single short line anchored
+    // at the doc start. Only diff is that in 'old' version it is slightly rotated, in 'new'
+    // version line is strict hiorizontal. Checked against MSWord2013, there the line
+    // is also not rotated -> the change is to the better, correct the expected result here.
+    CPPUNIT_ASSERT_EQUAL(OUString("1695"), aTop);
 }
 
 DECLARE_OOXMLIMPORT_TEST(testTdf114217, "tdf114217.docx")

sw/qa/extras/rtfimport/rtfimport.cxx

@@ -1244,13 +1244,21 @@ DECLARE_RTFIMPORT_TEST(testTdf90097, "tdf90097.rtf")
     uno::Sequence<uno::Sequence<awt::Point>> aPolyPolySequence;
     xShape->getPropertyValue("PolyPolygon") >>= aPolyPolySequence;
     uno::Sequence<awt::Point>& rPolygon = aPolyPolySequence[0];
+
+    // tdf#106792 These values were wrong all the time due to a missing
+    // conversion in SvxShapePolyPolygon::getPropertyValueImpl. There was no
+    // ForceMetricTo100th_mm -> the old results were in twips due to the
+    // object residing in Writer. The UNO API by definition is in 100thmm,
+    // thus I will correct the values here.
+    // Indeed need to use the Linux values, I have no idea why these differ
+    // from Mac/Win ones, but the disable above hints to that (maybe a problem
+    // of it's own). Factor between Twips and 100thmm is ca. 1.76 -> stable change
+
     // Vertical flip for the line shape was ignored, so Y coordinates were swapped.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2819), rPolygon[0].X);
-    // This was 1619.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1963), rPolygon[0].Y);
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3181), rPolygon[1].X);
-    // This was 1962.
-    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1620), rPolygon[1].Y);
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4972), rPolygon[0].X); // was: 2819, win is 10927
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3463), rPolygon[0].Y); // was: 1963
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5617), rPolygon[1].X); // was: 3181, win is 11572
+    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2852), rPolygon[1].Y); // was: 1620
 }
 #endif
 

xmloff/source/draw/xexptran.cxx

@@ -32,7 +32,6 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/utils/unotools.hxx>
 #include <basegfx/matrix/b3dhommatrixtools.hxx>
 
 using namespace ::com::sun::star;