Resolves: #i123433# Detect pseudo-vertices at svg import...

unify svg:d handling, correct svg:d import for relative sub-polygons in svg
import; changed default for moveto writes for svg:d in ODF to absolute

(cherry picked from commit f15874d8f976f3874bdbcb53429eeefa65c28841)

Conflicts:
	basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
	basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
	basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
	basegfx/source/polygon/b2dpolypolygontools.cxx
	basegfx/source/polygon/b2dsvgpolypolygon.cxx
	basegfx/source/polygon/b3dpolypolygontools.cxx
	basegfx/source/tools/makefile.mk
	basegfx/test/boxclipper.cxx
	basegfx/test/clipstate.cxx
	basegfx/test/genericclipper.cxx
	canvas/source/tools/surfaceproxy.cxx
	sdext/source/pdfimport/tree/drawtreevisiting.cxx
	sdext/source/pdfimport/tree/writertreevisiting.cxx
	xmloff/inc/xexptran.hxx
	xmloff/source/draw/XMLImageMapContext.cxx
	xmloff/source/draw/XMLImageMapExport.cxx
	xmloff/source/draw/shapeexport2.cxx
	xmloff/source/draw/shapeexport3.cxx
	xmloff/source/draw/xexptran.cxx
	xmloff/source/draw/ximp3dobject.cxx
	xmloff/source/draw/ximpshap.cxx
	xmloff/source/style/MarkerStyle.cxx
	xmloff/source/text/XMLTextFrameContext.cxx
	xmloff/source/text/txtparae.cxx

Change-Id: I5171b4a3559ea116bea45152e1f2685666463635

1 files changed, 11 insertions, 67 deletions

diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 77944533de2b..2c8112adf360 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -93,79 +93,23 @@ public:
 
 class SdXMLImExViewBox
 {
-    OUString               msString;
-    sal_Int32                   mnX;
-    sal_Int32                   mnY;
-    sal_Int32                   mnW;
-    sal_Int32                   mnH;
+    OUString msString;
+    double   mfX;
+    double   mfY;
+    double   mfW;
+    double   mfH;
 
 public:
-    SdXMLImExViewBox(sal_Int32 nX = 0L, sal_Int32 nY = 0L, sal_Int32 nW = 1000L, sal_Int32 nH = 1000L);
+    SdXMLImExViewBox(double fX = 0.0, double fY = 0.0, double fW = 1000.0, double fH = 1000.0);
     SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverter& rConv);
 
-    sal_Int32 GetX() const { return mnX; }
-    sal_Int32 GetY() const { return mnY; }
-    sal_Int32 GetWidth() const { return mnW; }
-    sal_Int32 GetHeight() const { return mnH; }
+    double GetX() const { return mfX; }
+    double GetY() const { return mfY; }
+    double GetWidth() const { return mfW; }
+    double GetHeight() const { return mfH; }
     const OUString& GetExportString();
 };
 
-class SdXMLImExPointsElement
-{
-    OUString               msString;
-    com::sun::star::drawing::PointSequenceSequence  maPoly;
-
-public:
-    SdXMLImExPointsElement(com::sun::star::drawing::PointSequence* pPoints,
-        const SdXMLImExViewBox& rViewBox,
-        const com::sun::star::awt::Point& rObjectPos,
-        const com::sun::star::awt::Size& rObjectSize,
-        // #96328#
-        const bool bClosed = true);
-    SdXMLImExPointsElement(const OUString& rNew,
-        const SdXMLImExViewBox& rViewBox,
-        const com::sun::star::awt::Point& rObjectPos,
-        const com::sun::star::awt::Size& rObjectSize,
-        const SvXMLUnitConverter& rConv);
-
-    const OUString& GetExportString() const { return msString; }
-    const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly; }
-};
-
-class SdXMLImExSvgDElement
-{
-    OUString                   msString;
-    const SdXMLImExViewBox&         mrViewBox;
-    bool                            mbIsClosed;
-    bool                            mbIsCurve;
-    bool                            mbRelative;
-    sal_Int32                       mnLastX;
-    sal_Int32                       mnLastY;
-
-    com::sun::star::drawing::PolyPolygonBezierCoords maPoly;
-
-public:
-    SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox, const SvXMLExport& rExport);
-    SdXMLImExSvgDElement(const OUString& rNew,
-        const SdXMLImExViewBox& rViewBox,
-        const com::sun::star::awt::Point& rObjectPos,
-        const com::sun::star::awt::Size& rObjectSize,
-        const SvXMLImport& rImport);
-
-    void AddPolygon(
-        com::sun::star::drawing::PointSequence* pPoints,
-        com::sun::star::drawing::FlagSequence* pFlags,
-        const com::sun::star::awt::Point& rObjectPos,
-        const com::sun::star::awt::Size& rObjectSize,
-        bool bClosed = false);
-
-    const OUString& GetExportString() const { return msString; }
-    bool IsClosed() const { return mbIsClosed; }
-    bool IsCurve() const { return mbIsCurve; }
-    const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly.Coordinates; }
-    const com::sun::star::drawing::FlagSequenceSequence& GetFlagSequenceSequence() const { return maPoly.Flags; }
-};
-
-#endif // INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
+#endif  //  _XEXPTRANSFORM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */