#i112245# 1st part for SvtGraphicStroke

10 files changed, 111 insertions, 107 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
index bd8c3be1fbbd..71c4cc6ffe1e 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer
                 const basegfx::B2DHomMatrix& rTransformation,
                 const Primitive2DSequence& rChildren);
 
-            // get data
+            /// data read access
             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& getChartModel() const { return mxChartModel; }
             const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; }
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
index 7872ad825496..c60257551c28 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
@@ -90,7 +90,7 @@
 #define PRIMITIVE2D_ID_EXECUTEPRIMITIVE2D                   (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 47)
 #define PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D               (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 48)
 #define PRIMITIVE2D_ID_CHARTPRIMITIVE2D                     (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 49)
-#define PRIMITIVE2D_ID_STRUCTURETAGRIMITIVE2D               (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
+#define PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D              (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 50)
 #define PRIMITIVE2D_ID_BORDERLINEPRIMITIVE2D                (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 51)
 #define PRIMITIVE2D_ID_POLYPOLYGONMARKERPRIMITIVE2D         (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 52)
 #define PRIMITIVE2D_ID_INVERTPRIMITIVE2D                    (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 53)
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
index ce49995c999d..d651af24047d 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx
@@ -101,7 +101,7 @@ namespace drawinglayer
                 double fShadowSlant,
                 const basegfx::B3DRange& rScene3DRange);
 
-            /// get data
+            /// data read access
             const primitive3d::Primitive3DSequence& getChildren3D() const { return mxChildren3D; }
             const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
             const geometry::ViewInformation3D& getViewInformation3D() const { return maViewInformation3D; }
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
index 237ae00a4642..e2323765b2e5 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -94,8 +94,8 @@ namespace drawinglayer
                 double fDiscreteDashLength);
 
             /// data read access
-            const basegfx::B2DPoint getPosition() const { return maPosition; }
-            const basegfx::B2DVector getDirection() const { return maDirection; }
+            const basegfx::B2DPoint& getPosition() const { return maPosition; }
+            const basegfx::B2DVector& getDirection() const { return maDirection; }
             HelplineStyle2D getStyle() const { return meStyle; }
             const basegfx::BColor& getRGBColA() const { return maRGBColA; }
             const basegfx::BColor& getRGBColB() const { return maRGBColB; }
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 80e281ede05c..ee5de781be86 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -189,7 +189,7 @@ namespace drawinglayer
                 const attribute::LineAttribute& rLineAttribute);
 
             /// data read access
-            basegfx::B2DPolygon getB2DPolygon() const { return maPolygon; }
+            const basegfx::B2DPolygon& getB2DPolygon() const { return maPolygon; }
             const attribute::LineAttribute& getLineAttribute() const { return maLineAttribute; }
             const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; }
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index 18743937b6bc..4a48ae0d3e59 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -69,7 +69,7 @@ namespace drawinglayer
             PolyPolygonHairlinePrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor);
 
             /// data read access
-            basegfx::B2DPolyPolygon getB2DPolyPolygon() const { return maPolyPolygon; }
+            const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
             const basegfx::BColor& getBColor() const { return maBColor; }
 
             /// compare operator
@@ -123,7 +123,7 @@ namespace drawinglayer
                 double fDiscreteDashLength);
 
             // data read access
-            basegfx::B2DPolyPolygon getB2DPolyPolygon() const { return maPolyPolygon; }
+            const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
             const basegfx::BColor& getRGBColorA() const { return maRGBColorA; }
             const basegfx::BColor& getRGBColorB() const { return maRGBColorB; }
             double getDiscreteDashLength() const { return mfDiscreteDashLength; }
@@ -182,7 +182,7 @@ namespace drawinglayer
                 const attribute::LineAttribute& rLineAttribute);
 
             /// data read access
-            basegfx::B2DPolyPolygon getB2DPolyPolygon() const { return maPolyPolygon; }
+            const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; }
             const attribute::LineAttribute& getLineAttribute() const { return maLineAttribute; }
             const attribute::StrokeAttribute& getStrokeAttribute() const { return maStrokeAttribute; }
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
index 4c95972ca67d..278a1b0bfff2 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -136,7 +136,7 @@ namespace drawinglayer
                 const basegfx::B2DHomMatrix& rObjectTransformation,
                 const geometry::ViewInformation3D& rViewInformation3D);
 
-            /// data ead access
+            /// data read access
             const primitive3d::Primitive3DSequence& getChildren3D() const { return mxChildren3D; }
             const attribute::SdrSceneAttribute& getSdrSceneAttribute() const { return maSdrSceneAttribute; }
             const attribute::SdrLightingAttribute& getSdrLightingAttribute() const { return maSdrLightingAttribute; }
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 6ae691cbcff9..5c1093bc333a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -129,8 +129,8 @@ namespace drawinglayer
             TextStrikeout getTextStrikeout() const { return meTextStrikeout; }
             TextEmphasisMark getTextEmphasisMark() const { return meTextEmphasisMark; }
             TextRelief getTextRelief() const { return meTextRelief; }
-            basegfx::BColor getOverlineColor() const { return maOverlineColor; }
-            basegfx::BColor getTextlineColor() const { return maTextlineColor; }
+            const basegfx::BColor& getOverlineColor() const { return maOverlineColor; }
+            const basegfx::BColor& getTextlineColor() const { return maTextlineColor; }
             bool getUnderlineAbove() const { return mbUnderlineAbove; }
             bool getWordLineMode() const { return mbWordLineMode; }
             bool getEmphasisMarkAbove() const { return mbEmphasisMarkAbove; }
diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
index 0ead7302ba38..8adcb6a10b82 100644
--- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx
@@ -50,7 +50,7 @@ namespace drawinglayer
         }
 
         // provide unique ID
-        ImplPrimitrive2DIDBlock(StructureTagPrimitive2D, PRIMITIVE2D_ID_STRUCTURETAGRIMITIVE2D)
+        ImplPrimitrive2DIDBlock(StructureTagPrimitive2D, PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D)
 
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 0bc1b57113b8..68ca424cca78 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -982,26 +982,69 @@ namespace drawinglayer
                 }
                 case PRIMITIVE2D_ID_POLYGONHAIRLINEPRIMITIVE2D :
                 {
-                    // direct draw of hairline; use default processing
-                    // also support SvtGraphicStroke MetaCommentAction
                     const primitive2d::PolygonHairlinePrimitive2D& rHairlinePrimitive = static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate);
-                    const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rHairlinePrimitive.getBColor()));
-                    SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(rHairlinePrimitive.getB2DPolygon(), &aLineColor, 0, 0, 0, 0);
+                    const basegfx::B2DPolygon& rBasePolygon = rHairlinePrimitive.getB2DPolygon();
 
-                    impStartSvtGraphicStroke(pSvtGraphicStroke);
-                    RenderPolygonHairlinePrimitive2D(static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate), false);
-                    impEndSvtGraphicStroke(pSvtGraphicStroke);
+                    if(rBasePolygon.count() > (0x0000ffff - 1))
+                    {
+                        // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points
+                        // per polygon. If there are more, split the polygon in half and call recursively
+                        const sal_uInt32 nCount(rBasePolygon.count());
+                        const sal_uInt32 nHalfCount((nCount - 1) >> 1);
+                        const basegfx::B2DPolygon aLeft(rBasePolygon, 0, nHalfCount + 1);
+                        const basegfx::B2DPolygon aRight(rBasePolygon, nHalfCount, nCount - nHalfCount);
+                        const primitive2d::PolygonHairlinePrimitive2D aPLeft(aLeft, rHairlinePrimitive.getBColor());
+                        const primitive2d::PolygonHairlinePrimitive2D aPRight(aRight, rHairlinePrimitive.getBColor());
+
+                        processBasePrimitive2D(aPLeft);
+                        processBasePrimitive2D(aPRight);
+                    }
+                    else
+                    {
+                        // direct draw of hairline; use default processing
+                        // support SvtGraphicStroke MetaCommentAction
+                        const basegfx::BColor aLineColor(maBColorModifierStack.getModifiedColor(rHairlinePrimitive.getBColor()));
+                        SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(
+                            rHairlinePrimitive.getB2DPolygon(),
+                            &aLineColor,
+                            0, 0, 0, 0);
+
+                        impStartSvtGraphicStroke(pSvtGraphicStroke);
+                        RenderPolygonHairlinePrimitive2D(static_cast< const primitive2d::PolygonHairlinePrimitive2D& >(rCandidate), false);
+                        impEndSvtGraphicStroke(pSvtGraphicStroke);
+                    }
                     break;
                 }
                 case PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D :
                 {
-                    // support SvtGraphicStroke MetaCommentAction
                     const primitive2d::PolygonStrokePrimitive2D& rStrokePrimitive = static_cast< const primitive2d::PolygonStrokePrimitive2D& >(rCandidate);
-                    SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(rStrokePrimitive.getB2DPolygon(), 0, &rStrokePrimitive.getLineAttribute(),
-                        &rStrokePrimitive.getStrokeAttribute(), 0, 0);
+                    const basegfx::B2DPolygon& rBasePolygon = rStrokePrimitive.getB2DPolygon();
 
-                    if(true)
+                    if(rBasePolygon.count() > (0x0000ffff - 1))
                     {
+                        // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points
+                        // per polygon. If there are more, split the polygon in half and call recursively
+                        const sal_uInt32 nCount(rBasePolygon.count());
+                        const sal_uInt32 nHalfCount((nCount - 1) >> 1);
+                        const basegfx::B2DPolygon aLeft(rBasePolygon, 0, nHalfCount + 1);
+                        const basegfx::B2DPolygon aRight(rBasePolygon, nHalfCount, nCount - nHalfCount);
+                        const primitive2d::PolygonStrokePrimitive2D aPLeft(
+                            aLeft, rStrokePrimitive.getLineAttribute(), rStrokePrimitive.getStrokeAttribute());
+                        const primitive2d::PolygonStrokePrimitive2D aPRight(
+                            aRight, rStrokePrimitive.getLineAttribute(), rStrokePrimitive.getStrokeAttribute());
+
+                        processBasePrimitive2D(aPLeft);
+                        processBasePrimitive2D(aPRight);
+                    }
+                    else
+                    {
+                        // support SvtGraphicStroke MetaCommentAction
+                        SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(
+                            rBasePolygon, 0,
+                            &rStrokePrimitive.getLineAttribute(),
+                            &rStrokePrimitive.getStrokeAttribute(),
+                            0, 0);
+
                         impStartSvtGraphicStroke(pSvtGraphicStroke);
                         const attribute::LineAttribute& rLine = rStrokePrimitive.getLineAttribute();
 
@@ -1013,12 +1056,12 @@ namespace drawinglayer
 
                             if(0.0 == rStroke.getFullDotDashLen())
                             {
-                                aHairLinePolyPolygon.append(rStrokePrimitive.getB2DPolygon());
+                                aHairLinePolyPolygon.append(rBasePolygon);
                             }
                             else
                             {
                                 basegfx::tools::applyLineDashing(
-                                    rStrokePrimitive.getB2DPolygon(), rStroke.getDotDashArray(),
+                                    rBasePolygon, rStroke.getDotDashArray(),
                                     &aHairLinePolyPolygon, 0, rStroke.getFullDotDashLen());
                             }
 
@@ -1048,93 +1091,54 @@ namespace drawinglayer
 
                         impEndSvtGraphicStroke(pSvtGraphicStroke);
                     }
-                    else
-                    {
-                        // Adapt OutDev's DrawMode if special ones were used
-                        const sal_uInt32 nOriginalDrawMode(mpOutputDevice->GetDrawMode());
-                        adaptLineToFillDrawMode();
-
-                        impStartSvtGraphicStroke(pSvtGraphicStroke);
-
-                        // #i101491#
-                        // Change default of fat line generation for MetaFiles: Create MetaPolyLineAction
-                        // instead of decomposing all geometries when the polygon has more than given amount of
-                        // points; else the decomposition will get too expensive quiclky. OTOH
-                        // the decomposition provides the better quality e.g. taking edge roundings
-                        // into account which will NOT be taken into account with LineInfo-based actions
-                        const sal_uInt32 nSubPolygonCount(rStrokePrimitive.getB2DPolygon().count());
-                        bool bDone(0 == nSubPolygonCount);
-
-                        if(!bDone && nSubPolygonCount > 1000)
-                        {
-                            // create MetaPolyLineActions, but without LINE_DASH
-                            const attribute::LineAttribute& rLine = rStrokePrimitive.getLineAttribute();
-
-                            if(basegfx::fTools::more(rLine.getWidth(), 0.0))
-                            {
-                                const attribute::StrokeAttribute& rStroke = rStrokePrimitive.getStrokeAttribute();
-                                basegfx::B2DPolyPolygon aHairLinePolyPolygon;
-
-                                if(0.0 == rStroke.getFullDotDashLen())
-                                {
-                                    aHairLinePolyPolygon.append(rStrokePrimitive.getB2DPolygon());
-                                }
-                                else
-                                {
-                                    basegfx::tools::applyLineDashing(
-                                        rStrokePrimitive.getB2DPolygon(), rStroke.getDotDashArray(),
-                                        &aHairLinePolyPolygon, 0, rStroke.getFullDotDashLen());
-                                }
-
-                                const basegfx::BColor aHairlineColor(maBColorModifierStack.getModifiedColor(rLine.getColor()));
-                                mpOutputDevice->SetLineColor(Color(aHairlineColor));
-                                mpOutputDevice->SetFillColor();
-
-                                aHairLinePolyPolygon.transform(maCurrentTransformation);
-
-                                const LineInfo aLineInfo(LINE_SOLID, basegfx::fround(rLine.getWidth()));
-
-                                for(sal_uInt32 a(0); a < aHairLinePolyPolygon.count(); a++)
-                                {
-                                    const basegfx::B2DPolygon aCandidate(aHairLinePolyPolygon.getB2DPolygon(a));
-
-                                    if(aCandidate.count() > 1)
-                                    {
-                                        const Polygon aToolsPolygon(aCandidate);
-
-                                        mpMetaFile->AddAction(new MetaPolyLineAction(aToolsPolygon, aLineInfo));
-                                    }
-                                }
-
-                                bDone = true;
-                            }
-                        }
-
-                        if(!bDone)
-                        {
-                            // use decomposition (creates line geometry as filled polygon
-                            // geometry)
-                            process(rCandidate.get2DDecomposition(getViewInformation2D()));
-                        }
-
-                        impEndSvtGraphicStroke(pSvtGraphicStroke);
-
-                        // restore DrawMode
-                        mpOutputDevice->SetDrawMode(nOriginalDrawMode);
-                    }
 
                     break;
                 }
                 case PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D :
                 {
-                    // support SvtGraphicStroke MetaCommentAction
                     const primitive2d::PolygonStrokeArrowPrimitive2D& rStrokeArrowPrimitive = static_cast< const primitive2d::PolygonStrokeArrowPrimitive2D& >(rCandidate);
-                    SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(rStrokeArrowPrimitive.getB2DPolygon(), 0, &rStrokeArrowPrimitive.getLineAttribute(),
-                        &rStrokeArrowPrimitive.getStrokeAttribute(), &rStrokeArrowPrimitive.getStart(), &rStrokeArrowPrimitive.getEnd());
+                    const basegfx::B2DPolygon& rBasePolygon = rStrokeArrowPrimitive.getB2DPolygon();
+
+                    if(rBasePolygon.count() > (0x0000ffff - 1))
+                    {
+                        // #i112245# Metafiles use tools Polygon and are not able to have more than 65535 points
+                        // per polygon. If there are more, split the polygon in half and call recursively
+                        const sal_uInt32 nCount(rBasePolygon.count());
+                        const sal_uInt32 nHalfCount((nCount - 1) >> 1);
+                        const basegfx::B2DPolygon aLeft(rBasePolygon, 0, nHalfCount + 1);
+                        const basegfx::B2DPolygon aRight(rBasePolygon, nHalfCount, nCount - nHalfCount);
+                        const attribute::LineStartEndAttribute aEmpty;
+                        const primitive2d::PolygonStrokeArrowPrimitive2D aPLeft(
+                            aLeft,
+                            rStrokeArrowPrimitive.getLineAttribute(),
+                            rStrokeArrowPrimitive.getStrokeAttribute(),
+                            rStrokeArrowPrimitive.getStart(),
+                            aEmpty);
+                        const primitive2d::PolygonStrokeArrowPrimitive2D aPRight(
+                            aRight,
+                            rStrokeArrowPrimitive.getLineAttribute(),
+                            rStrokeArrowPrimitive.getStrokeAttribute(),
+                            aEmpty,
+                            rStrokeArrowPrimitive.getEnd());
+
+                        processBasePrimitive2D(aPLeft);
+                        processBasePrimitive2D(aPRight);
+                    }
+                    else
+                    {
+                        // support SvtGraphicStroke MetaCommentAction
+                        SvtGraphicStroke* pSvtGraphicStroke = impTryToCreateSvtGraphicStroke(
+                            rBasePolygon, 0,
+                            &rStrokeArrowPrimitive.getLineAttribute(),
+                            &rStrokeArrowPrimitive.getStrokeAttribute(),
+                            &rStrokeArrowPrimitive.getStart(),
+                            &rStrokeArrowPrimitive.getEnd());
+
+                        impStartSvtGraphicStroke(pSvtGraphicStroke);
+                        process(rCandidate.get2DDecomposition(getViewInformation2D()));
+                        impEndSvtGraphicStroke(pSvtGraphicStroke);
+                    }
 
-                    impStartSvtGraphicStroke(pSvtGraphicStroke);
-                    process(rCandidate.get2DDecomposition(getViewInformation2D()));
-                    impEndSvtGraphicStroke(pSvtGraphicStroke);
                     break;
                 }
                 case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D :
@@ -1780,7 +1784,7 @@ namespace drawinglayer
                     }
                     break;
                 }
-                case PRIMITIVE2D_ID_STRUCTURETAGRIMITIVE2D :
+                case PRIMITIVE2D_ID_STRUCTURETAGPRIMITIVE2D :
                 {
                     // structured tag primitive
                     const primitive2d::StructureTagPrimitive2D& rStructureTagCandidate = static_cast< const primitive2d::StructureTagPrimitive2D& >(rCandidate);