diff options
| author | Noel Grandin <noel@peralex.com> | 2015-06-03 14:31:19 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-05 23:17:42 -0500 |
| commit | a3b09f13708cbb1c30c1e7fe85f6dd5365369ed9 (patch) | |
| tree | cc1be33dc9e5980cafbfb64071b6e13b48fe7e11 | |
| parent | e07615ebd2edcde278ce82f45dfa3409b8a9fe8a (diff) | |
convert B2DLineJoin to scoped enum
Change-Id: I4fb8f2c9e2080e3aa542d2ccf838e6784baa8429
(cherry picked from commit 42f771d6e9c02c50acc49f7feb1a9b5d0a9368ae)
38 files changed, 148 insertions, 148 deletions
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 860161d6af67..5f75be6c6981 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -679,7 +679,7 @@ namespace basegfx double fMiterMinimumAngle) { OSL_ENSURE(fHalfLineWidth > 0.0, "createAreaGeometryForJoin: LineWidth too small (!)"); - OSL_ENSURE(B2DLINEJOIN_NONE != eJoin, "createAreaGeometryForJoin: B2DLINEJOIN_NONE not allowed (!)"); + OSL_ENSURE(B2DLineJoin::NONE != eJoin, "createAreaGeometryForJoin: B2DLineJoin::NONE not allowed (!)"); // LineJoin from tangent rPerpendPrev to tangent rPerpendEdge in rPoint B2DPolygon aEdgePolygon; @@ -688,20 +688,20 @@ namespace basegfx // test if for Miter, the angle is too small and the fallback // to bevel needs to be used - if(B2DLINEJOIN_MITER == eJoin) + if(B2DLineJoin::Miter == eJoin) { const double fAngle(fabs(rPerpendPrev.angle(rPerpendEdge))); if((F_PI - fAngle) < fMiterMinimumAngle) { // fallback to bevel - eJoin = B2DLINEJOIN_BEVEL; + eJoin = B2DLineJoin::Bevel; } } switch(eJoin) { - case B2DLINEJOIN_MITER : + case B2DLineJoin::Miter : { aEdgePolygon.append(aEndPoint); aEdgePolygon.append(rPoint); @@ -723,7 +723,7 @@ namespace basegfx break; } - case B2DLINEJOIN_ROUND : + case B2DLineJoin::Round : { // use tooling to add needed EllipseSegment double fAngleStart(atan2(rPerpendPrev.getY(), rPerpendPrev.getX())); @@ -760,7 +760,7 @@ namespace basegfx // wanted fall-through to default } } - default: // B2DLINEJOIN_BEVEL + default: // B2DLineJoin::Bevel { aEdgePolygon.append(aEndPoint); aEdgePolygon.append(rPoint); @@ -835,7 +835,7 @@ namespace basegfx B2DCubicBezier aEdge; B2DCubicBezier aPrev; - const bool bEventuallyCreateLineJoin(B2DLINEJOIN_NONE != eJoin); + const bool bEventuallyCreateLineJoin(B2DLineJoin::NONE != eJoin); // prepare edge aEdge.setStartPoint(aCandidate.getB2DPoint(0)); diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 5f3ee58f21a3..4a83220b7f14 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -70,23 +70,23 @@ namespace vclcanvas switch( nJoinType ) { case rendering::PathJoinType::NONE: - return basegfx::B2DLINEJOIN_NONE; + return basegfx::B2DLineJoin::NONE; case rendering::PathJoinType::MITER: - return basegfx::B2DLINEJOIN_MITER; + return basegfx::B2DLineJoin::Miter; case rendering::PathJoinType::ROUND: - return basegfx::B2DLINEJOIN_ROUND; + return basegfx::B2DLineJoin::Round; case rendering::PathJoinType::BEVEL: - return basegfx::B2DLINEJOIN_BEVEL; + return basegfx::B2DLineJoin::Bevel; default: ENSURE_OR_THROW( false, "b2DJoineFromJoin(): Unexpected join type" ); } - return basegfx::B2DLINEJOIN_NONE; + return basegfx::B2DLineJoin::NONE; } drawing::LineCap unoCapeFromCap( sal_Int8 nCapType) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 99c76b2ae12d..c1b3a1701b88 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -124,16 +124,16 @@ namespace switch(rLineInfo.GetLineJoin()) { - default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE + default: // B2DLineJoin::NONE, B2DLineJoin::Middle o_rStrokeAttributes.JoinType = rendering::PathJoinType::NONE; break; - case basegfx::B2DLINEJOIN_BEVEL: + case basegfx::B2DLineJoin::Bevel: o_rStrokeAttributes.JoinType = rendering::PathJoinType::BEVEL; break; - case basegfx::B2DLINEJOIN_MITER: + case basegfx::B2DLineJoin::Miter: o_rStrokeAttributes.JoinType = rendering::PathJoinType::MITER; break; - case basegfx::B2DLINEJOIN_ROUND: + case basegfx::B2DLineJoin::Round: o_rStrokeAttributes.JoinType = rendering::PathJoinType::ROUND; break; } diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx index 6d22e569ada7..c5c4cf486b7d 100644 --- a/drawinglayer/source/attribute/lineattribute.cxx +++ b/drawinglayer/source/attribute/lineattribute.cxx @@ -51,7 +51,7 @@ namespace drawinglayer ImpLineAttribute() : maColor(basegfx::BColor()), mfWidth(0.0), - meLineJoin(basegfx::B2DLINEJOIN_ROUND), + meLineJoin(basegfx::B2DLineJoin::Round), meLineCap(com::sun::star::drawing::LineCap_BUTT) { } diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index f1842fa03853..778f24257212 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -58,7 +58,7 @@ namespace drawinglayer } ImpSdrLineAttribute() - : meJoin(basegfx::B2DLINEJOIN_ROUND), + : meJoin(basegfx::B2DLineJoin::Round), mfWidth(0.0), mfTransparence(0.0), maColor(basegfx::BColor()), diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 100d2f31f7b8..fc4f0f381635 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1733,7 +1733,7 @@ namespace } else { - aLineInfo.SetLineJoin(basegfx::B2DLINEJOIN_NONE); // It were lines; force to NONE + aLineInfo.SetLineJoin(basegfx::B2DLineJoin::NONE); // It were lines; force to NONE createLinePrimitive(aLinePolygon, aLineInfo, rTargetHolders.Current(), rPropertyHolders.Current()); aLinePolygon.clear(); aLineInfo = pA->GetLineInfo(); @@ -1755,7 +1755,7 @@ namespace if(aLinePolygon.count()) { - aLineInfo.SetLineJoin(basegfx::B2DLINEJOIN_NONE); // It were lines; force to NONE + aLineInfo.SetLineJoin(basegfx::B2DLineJoin::NONE); // It were lines; force to NONE createLinePrimitive(aLinePolygon, aLineInfo, rTargetHolders.Current(), rPropertyHolders.Current()); } } diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index c6bbfd2f45c5..92e48b1df690 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -344,7 +344,7 @@ namespace drawinglayer { bool bUseDecomposition(false); - if(basegfx::B2DLINEJOIN_MITER == getLineAttribute().getLineJoin()) + if(basegfx::B2DLineJoin::Miter == getLineAttribute().getLineJoin()) { // if line is mitered, use parent call since mitered line // geometry may use more space than the geometry grown by half line width diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index b3d669f053ed..e9a02d478481 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -41,7 +41,7 @@ namespace drawinglayer bool bWaveLine(false); bool bBoldLine(false); const int* pDotDashArray(0); - basegfx::B2DLineJoin eLineJoin(basegfx::B2DLINEJOIN_NONE); + basegfx::B2DLineJoin eLineJoin(basegfx::B2DLineJoin::NONE); double fOffset(getOffset()); double fHeight(getHeight()); @@ -164,7 +164,7 @@ namespace drawinglayer if(bWaveLine) { - eLineJoin = basegfx::B2DLINEJOIN_ROUND; + eLineJoin = basegfx::B2DLineJoin::Round; fHeight *= 0.25; } diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index e5ffc580f96f..13e937efd09d 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -204,7 +204,7 @@ namespace drawinglayer aStrikeoutLine.transform(aUnscaledTransform); // add primitive - const attribute::LineAttribute aLineAttribute(getFontColor(), fStrikeoutHeight, basegfx::B2DLINEJOIN_NONE); + const attribute::LineAttribute aLineAttribute(getFontColor(), fStrikeoutHeight, basegfx::B2DLineJoin::NONE); Primitive2DSequence xRetval(1); xRetval[0] = Primitive2DReference(new PolygonStrokePrimitive2D(aStrikeoutLine, aLineAttribute)); diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 578026ba055c..9b45621c2996 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -300,7 +300,7 @@ namespace drawinglayer if(nVerSeg) { - if(basegfx::B2DLINEJOIN_ROUND == aLineJoin) + if(basegfx::B2DLineJoin::Round == aLineJoin) { // calculate new horizontal segments const sal_uInt32 nHorSeg(basegfx::fround((fAngle / F_2PI) * (double)nSegments)); @@ -321,29 +321,29 @@ namespace drawinglayer else { // fallback to bevel when there is not at least one segment hor and ver - aLineJoin = basegfx::B2DLINEJOIN_BEVEL; + aLineJoin = basegfx::B2DLineJoin::Bevel; } } - if(basegfx::B2DLINEJOIN_MIDDLE == aLineJoin - || basegfx::B2DLINEJOIN_BEVEL == aLineJoin - || basegfx::B2DLINEJOIN_MITER == aLineJoin) + if(basegfx::B2DLineJoin::Middle == aLineJoin + || basegfx::B2DLineJoin::Bevel == aLineJoin + || basegfx::B2DLineJoin::Miter == aLineJoin) { - if(basegfx::B2DLINEJOIN_MITER == aLineJoin) + if(basegfx::B2DLineJoin::Miter == aLineJoin) { const double fMiterAngle(fAngle/2.0); if(fMiterAngle < fMiterMinimumAngle) { // fallback to bevel when miter's angle is too small - aLineJoin = basegfx::B2DLINEJOIN_BEVEL; + aLineJoin = basegfx::B2DLineJoin::Bevel; } } const double fInc(F_PI / (double)nVerSeg); const double fSin(sin(-fAngle)); const double fCos(cos(-fAngle)); - const bool bMiter(basegfx::B2DLINEJOIN_MITER == aLineJoin); + const bool bMiter(basegfx::B2DLineJoin::Miter == aLineJoin); const double fMiterSin(bMiter ? sin(-(fAngle/2.0)) : 0.0); const double fMiterCos(bMiter ? cos(-(fAngle/2.0)) : 0.0); double fPos(-F_PI2); @@ -547,7 +547,7 @@ namespace drawinglayer const attribute::MaterialAttribute3D aMaterial(getBColor()); static sal_uInt32 nSegments(8); // default for 3d line segments, for more quality just raise this value (in even steps) const bool bClosed(getB3DPolygon().isClosed()); - const bool bNoLineJoin(basegfx::B2DLINEJOIN_NONE == getLineJoin()); + const bool bNoLineJoin(basegfx::B2DLineJoin::NONE == getLineJoin()); const sal_uInt32 nLoopCount(bClosed ? nPointCount : nPointCount - 1); basegfx::B3DPoint aLast(getB3DPolygon().getB3DPoint(nPointCount - 1)); basegfx::B3DPoint aCurr(getB3DPolygon().getB3DPoint(0)); diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 4c5602d118d5..d71d42e067c9 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -335,7 +335,7 @@ namespace drawinglayer if(basegfx::fTools::more(rLineAttribute.getWidth(), 0.0)) { - if(basegfx::B2DLINEJOIN_MITER == rLineAttribute.getLineJoin()) + if(basegfx::B2DLineJoin::Miter == rLineAttribute.getLineJoin()) { // if line is mitered, use decomposition since mitered line // geometry may use more space than the geometry grown by half line width diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 77039f38e2ad..3f204e3d1fa4 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -456,25 +456,25 @@ namespace drawinglayer // get Join switch(pLineAttribute->getLineJoin()) { - default : // basegfx::B2DLINEJOIN_NONE : + default : // basegfx::B2DLineJoin::NONE : { eJoin = SvtGraphicStroke::joinNone; break; } - case basegfx::B2DLINEJOIN_BEVEL : + case basegfx::B2DLineJoin::Bevel : { eJoin = SvtGraphicStroke::joinBevel; break; } - case basegfx::B2DLINEJOIN_MIDDLE : - case basegfx::B2DLINEJOIN_MITER : + case basegfx::B2DLineJoin::Middle : + case basegfx::B2DLineJoin::Miter : { eJoin = SvtGraphicStroke::joinMiter; // ATM 15 degrees is assumed fMiterLength /= rtl::math::sin(M_PI * (15.0 / 360.0)); break; } - case basegfx::B2DLINEJOIN_ROUND : + case basegfx::B2DLineJoin::Round : { eJoin = SvtGraphicStroke::joinRound; break; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index ff573edfbfc7..99a09f97bcaf 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -753,10 +753,10 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) const LineInfo& rLineInfo = static_cast<const MetaPolyLineAction*>(pMA)->GetLineInfo(); ImplWriteLineInfo( rLineInfo ); - if(basegfx::B2DLINEJOIN_NONE == rLineInfo.GetLineJoin() + if(basegfx::B2DLineJoin::NONE == rLineInfo.GetLineJoin() && rLineInfo.GetWidth() > 1) { - // emulate B2DLINEJOIN_NONE by creating single edges + // emulate B2DLineJoin::NONE by creating single edges const sal_uInt16 nPoints(aPoly.GetSize()); const bool bCurve(aPoly.HasFlags()); @@ -2480,18 +2480,18 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) switch(rLineInfo.GetLineJoin()) { - default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE + default: // B2DLineJoin::NONE, B2DLineJoin::Middle // do NOT use SvtGraphicStroke::joinNone here // since it will be written as numerical value directly // and is NOT a valid EPS value break; - case basegfx::B2DLINEJOIN_MITER: + case basegfx::B2DLineJoin::Miter: aJoinType = SvtGraphicStroke::joinMiter; break; - case basegfx::B2DLINEJOIN_BEVEL: + case basegfx::B2DLineJoin::Bevel: aJoinType = SvtGraphicStroke::joinBevel; break; - case basegfx::B2DLINEJOIN_ROUND: + case basegfx::B2DLineJoin::Round: aJoinType = SvtGraphicStroke::joinRound; break; } diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx index 2cfefbe29b76..f5c4295f8b3d 100644 --- a/filter/source/graphicfilter/ipict/shape.cxx +++ b/filter/source/graphicfilter/ipict/shape.cxx @@ -118,7 +118,7 @@ namespace PictReaderShape { B2DPolygon poly; poly.append(B2DPoint(double(orig.X()+decal[0]), double(orig.Y()+decal[1]))); poly.append(B2DPoint(double(dest.X()+decal[0]), double(dest.Y()+decal[1]))); - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); } //-------------------- draws a rectangle -------------------- @@ -138,7 +138,7 @@ namespace PictReaderShape { poly.append(B2DPoint(X[0], Y[0])); if (drawFrame) - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); else dev->DrawPolygon(poly); } @@ -153,7 +153,7 @@ namespace PictReaderShape { B2DPoint center(0.5*(X[1]+X[0]), 0.5*(Y[1]+Y[0])); B2DPolygon poly = basegfx::tools::createPolygonFromEllipse(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0])); if (drawFrame) - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); else dev->DrawPolygon(poly); } @@ -186,7 +186,7 @@ namespace PictReaderShape { B2DPolygon poly = basegfx::tools::createPolygonFromEllipseSegment(center, 0.5*(X[1]-X[0]), 0.5*(Y[1]-Y[0]), angl1, angl2); if (drawFrame) - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); else { // adds circle's center poly.append(center); @@ -210,7 +210,7 @@ namespace PictReaderShape { B2DPolygon poly = basegfx::tools::createPolygonFromRect(rect, (width != 0.0) ? ovalW/width : 0.0, (height != 0.0) ? ovalH/height : 0.0); if (drawFrame) - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); else dev->DrawPolygon(poly); } @@ -248,7 +248,7 @@ namespace PictReaderShape { poly.append(B2DPoint(x, y)); } if (drawFrame) - dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLINEJOIN_NONE); + dev->DrawPolyLine(poly, double(penSize), basegfx::B2DLineJoin::NONE); else dev->DrawPolygon(poly); } diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index a11b5d98c33e..d51d74ec849f 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -180,7 +180,7 @@ struct State maDashArray(), mnDashOffset(0.0), meLineCap(BUTT), - meLineJoin(basegfx::B2DLINEJOIN_MITER), + meLineJoin(basegfx::B2DLineJoin::Miter), mnMiterLimit(4.0), mnStrokeWidth(1.0), maViewportFillColor(1.0), diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 4c5b9b08af52..e92c99b884d3 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -665,11 +665,11 @@ struct AnnotatingVisitor aVec *= maCurrState.maCTM; xAttrs->AddAttribute( "svg:stroke-width", OUString::number( pt2mm(aVec.getLength()) )+"mm"); } - if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_MITER ) + if( maCurrState.meLineJoin == basegfx::B2DLineJoin::Miter ) xAttrs->AddAttribute( "draw:stroke-linejoin", "miter"); - else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_ROUND ) + else if( maCurrState.meLineJoin == basegfx::B2DLineJoin::Round ) xAttrs->AddAttribute( "draw:stroke-linejoin", "round"); - else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_BEVEL ) + else if( maCurrState.meLineJoin == basegfx::B2DLineJoin::Bevel ) xAttrs->AddAttribute( "draw:stroke-linejoin", "bevel"); if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "svg:stroke-opacity", @@ -909,11 +909,11 @@ struct AnnotatingVisitor case XML_STROKE_LINEJOIN: { if( aValueUtf8 == "miter" ) - maCurrState.meLineJoin = basegfx::B2DLINEJOIN_MITER; + maCurrState.meLineJoin = basegfx::B2DLineJoin::Miter; else if( aValueUtf8 == "round" ) - maCurrState.meLineJoin = basegfx::B2DLINEJOIN_ROUND; + maCurrState.meLineJoin = basegfx::B2DLineJoin::Round; else if( aValueUtf8 == "bevel" ) - maCurrState.meLineJoin = basegfx::B2DLINEJOIN_BEVEL; + maCurrState.meLineJoin = basegfx::B2DLineJoin::Bevel; else if( aValueUtf8 == "inherit" ) maCurrState.meLineJoin = maParentStates.back().meLineJoin; break; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 1faf89ac8be9..6551882c30c3 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -99,7 +99,7 @@ SVGAttributeWriter::SVGAttributeWriter( SVGExport& rExport, SVGFontExport& rFont , mrFontExport( rFontExport ) , mpElemFont( NULL ) , mpElemPaint( NULL ) - , maLineJoin(basegfx::B2DLINEJOIN_NONE) + , maLineJoin(basegfx::B2DLineJoin::NONE) , maLineCap(css::drawing::LineCap_BUTT) { } @@ -1907,18 +1907,18 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs, // support for LineJoint switch(rAttrs.GetLineJoin()) { - default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE - case basegfx::B2DLINEJOIN_MITER: + default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::Miter: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter"); break; } - case basegfx::B2DLINEJOIN_BEVEL: + case basegfx::B2DLineJoin::Bevel: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel"); break; } - case basegfx::B2DLINEJOIN_ROUND: + case basegfx::B2DLineJoin::Round: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round"); break; @@ -1996,20 +1996,20 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp // support for LineJoin switch(rShape.maLineJoin) { - default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE - case basegfx::B2DLINEJOIN_MITER: + default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::Miter: { // miter is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter"); break; } - case basegfx::B2DLINEJOIN_BEVEL: + case basegfx::B2DLineJoin::Bevel: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel"); break; } - case basegfx::B2DLINEJOIN_ROUND: + case basegfx::B2DLineJoin::Round: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round"); break; @@ -3156,17 +3156,17 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { default: /* SvtGraphicStroke::joinMiter, SvtGraphicStroke::joinNone */ { - mapCurShape->maLineJoin = basegfx::B2DLINEJOIN_MITER; + mapCurShape->maLineJoin = basegfx::B2DLineJoin::Miter; break; } case SvtGraphicStroke::joinRound: { - mapCurShape->maLineJoin = basegfx::B2DLINEJOIN_ROUND; + mapCurShape->maLineJoin = basegfx::B2DLineJoin::Round; break; } case SvtGraphicStroke::joinBevel: { - mapCurShape->maLineJoin = basegfx::B2DLINEJOIN_BEVEL; + mapCurShape->maLineJoin = basegfx::B2DLineJoin::Bevel; break; } } @@ -3199,7 +3199,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, mapCurShape->maShapeLineColor = Color(COL_TRANSPARENT); mapCurShape->mnStrokeWidth = 0; mapCurShape->maDashArray.clear(); - mapCurShape->maLineJoin = basegfx::B2DLINEJOIN_MITER; + mapCurShape->maLineJoin = basegfx::B2DLineJoin::Miter; mapCurShape->maLineCap = com::sun::star::drawing::LineCap_BUTT; if(aStartArrow.Count()) diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index c99e4cbbd6b0..7d663c5f52e7 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -142,7 +142,7 @@ struct SVGShapeDescriptor maShapeFillColor( Color( COL_TRANSPARENT ) ), maShapeLineColor( Color( COL_TRANSPARENT ) ), mnStrokeWidth( 0 ), - maLineJoin(basegfx::B2DLINEJOIN_MITER), // miter is Svg 'stroke-linejoin' default + maLineJoin(basegfx::B2DLineJoin::Miter), // miter is Svg 'stroke-linejoin' default maLineCap(com::sun::star::drawing::LineCap_BUTT) // butt is Svg 'stroke-linecap' default { } diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index ca9fb18ad686..534adbef70c2 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -133,7 +133,7 @@ namespace basegfx BASEGFX_DLLPUBLIC B2DPolyPolygon createAreaGeometry( const B2DPolygon& rCandidate, double fHalfLineWidth, - B2DLineJoin eJoin = B2DLINEJOIN_ROUND, + B2DLineJoin eJoin = B2DLineJoin::Round, com::sun::star::drawing::LineCap eCap = com::sun::star::drawing::LineCap_BUTT, double fMaxAllowedAngle = (12.5 * F_PI180), double fMaxPartOfEdge = 0.4, diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx index b41db31b43b3..1480d3d35059 100644 --- a/include/basegfx/vector/b2enums.hxx +++ b/include/basegfx/vector/b2enums.hxx @@ -54,13 +54,13 @@ namespace basegfx /** Descriptor for possible line joins between two line segments */ - enum B2DLineJoin + enum class B2DLineJoin { - B2DLINEJOIN_NONE, // no rounding - B2DLINEJOIN_MIDDLE, // calc middle value between joints - B2DLINEJOIN_BEVEL, // join edges with line - B2DLINEJOIN_MITER, // extend till cut - B2DLINEJOIN_ROUND // create arc + NONE, // no rounding + Middle, // calc middle value between joints + Bevel, // join edges with line + Miter, // extend till cut + Round // create arc }; } // end of namespace basegfx diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 7f65e8f6470b..2e45752744c8 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -56,7 +56,7 @@ namespace drawinglayer explicit LineAttribute( const basegfx::BColor& rColor, double fWidth = 0.0, - basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLINEJOIN_ROUND, + basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round, com::sun::star::drawing::LineCap aLineCap = com::sun::star::drawing::LineCap_BUTT); LineAttribute(); LineAttribute(const LineAttribute& rCandidate); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index bd0ba8b8a8cf..523bd07e9868 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -836,7 +836,7 @@ public: void DrawPolyLine( const basegfx::B2DPolygon&, double fLineWidth = 0.0, - basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_ROUND, + basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::Round, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); /** Render the given polygon as a line stroke @@ -858,7 +858,7 @@ public: const basegfx::B2DPolygon& rB2DPolygon, double fLineWidth = 0.0, double fTransparency = 0.0, - basegfx::B2DLineJoin eLineJoin = basegfx::B2DLINEJOIN_NONE, + basegfx::B2DLineJoin eLineJoin = basegfx::B2DLineJoin::NONE, css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT, bool bBypassAACheck = false ); private: diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 4735887e4171..1ca8d646c43a 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -47,14 +47,14 @@ namespace svgio { if(StrokeLinejoin_round == aStrokeLinejoin) { - return basegfx::B2DLINEJOIN_ROUND; + return basegfx::B2DLineJoin::Round; } else if(StrokeLinejoin_bevel == aStrokeLinejoin) { - return basegfx::B2DLINEJOIN_BEVEL; + return basegfx::B2DLineJoin::Bevel; } - return basegfx::B2DLINEJOIN_MITER; + return basegfx::B2DLineJoin::Miter; } com::sun::star::drawing::LineCap StrokeLinecapToDrawingLineCap(StrokeLinecap aStrokeLinecap) diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 221019184a77..9aaf6f226f4e 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -57,23 +57,23 @@ namespace { case com::sun::star::drawing::LineJoint_MIDDLE : { - return basegfx::B2DLINEJOIN_MIDDLE; + return basegfx::B2DLineJoin::Middle; } case com::sun::star::drawing::LineJoint_BEVEL : { - return basegfx::B2DLINEJOIN_BEVEL; + return basegfx::B2DLineJoin::Bevel; } case com::sun::star::drawing::LineJoint_MITER : { - return basegfx::B2DLINEJOIN_MITER; + return basegfx::B2DLineJoin::Miter; } case com::sun::star::drawing::LineJoint_ROUND : { - return basegfx::B2DLINEJOIN_ROUND; + return basegfx::B2DLineJoin::Round; } default : // com::sun::star::drawing::LineJoint_NONE { - return basegfx::B2DLINEJOIN_NONE; // XLINEJOINT_NONE + return basegfx::B2DLineJoin::NONE; // XLINEJOINT_NONE } } } diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 4ac6708d24c7..522236729c62 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -138,23 +138,23 @@ namespace drawinglayer { case com::sun::star::drawing::LineJoint_MIDDLE : { - return basegfx::B2DLINEJOIN_MIDDLE; + return basegfx::B2DLineJoin::Middle; } case com::sun::star::drawing::LineJoint_BEVEL : { - return basegfx::B2DLINEJOIN_BEVEL; + return basegfx::B2DLineJoin::Bevel; } case com::sun::star::drawing::LineJoint_MITER : { - return basegfx::B2DLINEJOIN_MITER; + return basegfx::B2DLineJoin::Miter; } case com::sun::star::drawing::LineJoint_ROUND : { - return basegfx::B2DLINEJOIN_ROUND; + return basegfx::B2DLineJoin::Round; } default : // com::sun::star::drawing::LineJoint_NONE { - return basegfx::B2DLINEJOIN_NONE; + return basegfx::B2DLineJoin::NONE; } } } diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 002559e9cc11..bcd6b0b4ce26 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -88,7 +88,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( mnLayer(nLay), maOldLineColor(), mnLineWidth(0), - maLineJoin(basegfx::B2DLINEJOIN_NONE), + maLineJoin(basegfx::B2DLineJoin::NONE), maLineCap(com::sun::star::drawing::LineCap_BUTT), maDash(css::drawing::DashStyle_RECT, 0, 0, 0, 0, 0), mbMov(false), @@ -355,19 +355,19 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr switch(maLineJoin) { - default : // basegfx::B2DLINEJOIN_NONE + default : // basegfx::B2DLineJoin::NONE mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE)); break; - case basegfx::B2DLINEJOIN_MIDDLE: + case basegfx::B2DLineJoin::Middle: mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MIDDLE)); break; - case basegfx::B2DLINEJOIN_BEVEL: + case basegfx::B2DLineJoin::Bevel: mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL)); break; - case basegfx::B2DLINEJOIN_MITER: + case basegfx::B2DLineJoin::Miter: mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER)); break; - case basegfx::B2DLINEJOIN_ROUND: + case basegfx::B2DLineJoin::Round: mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND)); break; } @@ -707,7 +707,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction& rAct) rLineInfo.GetDistance()); SetAttributes(pPath); mnLineWidth = 0; - maLineJoin = basegfx::B2DLINEJOIN_NONE; + maLineJoin = basegfx::B2DLineJoin::NONE; maDash = XDash(); InsertObj(pPath, false); } @@ -933,7 +933,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct ) rLineInfo.GetDistance()); SetAttributes(pPath); mnLineWidth = 0; - maLineJoin = basegfx::B2DLINEJOIN_NONE; + maLineJoin = basegfx::B2DLineJoin::NONE; maDash = XDash(); InsertObj(pPath, false); } diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 453ae5c1f0d7..1464f18ce323 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -960,10 +960,10 @@ bool AquaSalGraphics::drawPolyLine( } #endif - // #i101491# Aqua does not support B2DLINEJOIN_NONE; return false to use + // #i101491# Aqua does not support B2DLineJoin::NONE; return false to use // the fallback (own geometry preparation) // #i104886# linejoin-mode and thus the above only applies to "fat" lines - if( (basegfx::B2DLINEJOIN_NONE == eLineJoin) && + if( (basegfx::B2DLineJoin::NONE == eLineJoin) && (rLineWidths.getX() > 1.3) ) { DBG_DRAW_OPERATION_EXIT_EARLY("drawPolyLine"); @@ -974,11 +974,11 @@ bool AquaSalGraphics::drawPolyLine( CGLineJoin aCGLineJoin = kCGLineJoinMiter; switch( eLineJoin ) { - case ::basegfx::B2DLINEJOIN_NONE: aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break; - case ::basegfx::B2DLINEJOIN_MIDDLE: aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break; - case ::basegfx::B2DLINEJOIN_BEVEL: aCGLineJoin = kCGLineJoinBevel; break; - case ::basegfx::B2DLINEJOIN_MITER: aCGLineJoin = kCGLineJoinMiter; break; - case ::basegfx::B2DLINEJOIN_ROUND: aCGLineJoin = kCGLineJoinRound; break; + case ::basegfx::B2DLineJoin::NONE: aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break; + case ::basegfx::B2DLineJoin::Middle: aCGLineJoin = /*TODO?*/kCGLineJoinMiter; break; + case ::basegfx::B2DLineJoin::Bevel: aCGLineJoin = kCGLineJoinBevel; break; + case ::basegfx::B2DLineJoin::Miter: aCGLineJoin = kCGLineJoinMiter; break; + case ::basegfx::B2DLineJoin::Round: aCGLineJoin = kCGLineJoinRound; break; } // setup cap attribute diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index f130fad1fd98..9aff0ccc5178 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -964,16 +964,16 @@ bool EnhWMFReader::ReadEnhWMF() switch( nStyle & 0xF000 ) { case PS_JOIN_ROUND : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_ROUND ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Round ); break; case PS_JOIN_MITER : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_MITER ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Miter ); break; case PS_JOIN_BEVEL : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_BEVEL ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Bevel ); break; default : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_NONE ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE ); } pOut->CreateObject( nIndex, GDI_PEN, new WinMtfLineStyle( ReadColor(), aLineInfo, bTransparent ) ); } diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index f947c9a872ee..e69b504348c6 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -863,16 +863,16 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) switch( nStyle & 0xF000 ) { case PS_JOIN_ROUND : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_ROUND ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Round ); break; case PS_JOIN_MITER : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_MITER ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Miter ); break; case PS_JOIN_BEVEL : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_BEVEL ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::Bevel ); break; default : - aLineInfo.SetLineJoin ( basegfx::B2DLINEJOIN_NONE ); + aLineInfo.SetLineJoin ( basegfx::B2DLineJoin::NONE ); } pOut->CreateObject( GDI_PEN, new WinMtfLineStyle( ReadColor(), aLineInfo, bTransparent ) ); } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index ba8c530f6818..7a559f12a760 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -1448,7 +1448,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const MetaLineAction* pAct = static_cast<const MetaLineAction*>(pAction); const LineInfo& rInfo = pAct->GetLineInfo(); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); - const bool bLineJoin(bFatLine && basegfx::B2DLINEJOIN_ROUND != rInfo.GetLineJoin()); + const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); @@ -1461,7 +1461,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { rOStm.WriteInt16( GDI_LINEJOIN_ACTION ); rOStm.WriteInt32( 6 ); - rOStm.WriteInt16( rInfo.GetLineJoin() ); + rOStm.WriteInt16( static_cast<sal_Int16>(rInfo.GetLineJoin()) ); } if(bLineCap) @@ -1604,7 +1604,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const LineInfo& rInfo = pAct->GetLineInfo(); const sal_uInt16 nPoints(aSimplePoly.GetSize()); const bool bFatLine(!rInfo.IsDefault() && (LINE_NONE != rInfo.GetStyle())); - const bool bLineJoin(bFatLine && basegfx::B2DLINEJOIN_ROUND != rInfo.GetLineJoin()); + const bool bLineJoin(bFatLine && basegfx::B2DLineJoin::Round != rInfo.GetLineJoin()); const bool bLineCap(bFatLine && com::sun::star::drawing::LineCap_BUTT != rInfo.GetLineCap()); const bool bLineDashDot(LINE_DASH == rInfo.GetStyle()); @@ -1617,7 +1617,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { rOStm.WriteInt16( GDI_LINEJOIN_ACTION ); rOStm.WriteInt32( 6 ); - rOStm.WriteInt16( rInfo.GetLineJoin() ); + rOStm.WriteInt16( static_cast<sal_Int16>(rInfo.GetLineJoin()) ); } if(bLineCap) diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index fc6fe4f6e7a8..55ec0ecdc8a2 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -37,7 +37,7 @@ ImplLineInfo::ImplLineInfo() : mnDotCount ( 0 ), mnDotLen ( 0 ), mnDistance ( 0 ), - meLineJoin ( basegfx::B2DLINEJOIN_ROUND ), + meLineJoin ( basegfx::B2DLineJoin::Round ), meLineCap ( com::sun::star::drawing::LineCap_BUTT ) { } @@ -237,7 +237,7 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo rOStm.WriteInt32( rImplLineInfo.mnDistance ); // since version3 - rOStm.WriteUInt16( rImplLineInfo.meLineJoin ); + rOStm.WriteUInt16( static_cast<sal_uInt16>(rImplLineInfo.meLineJoin) ); // since version4 rOStm.WriteUInt16( rImplLineInfo.meLineCap ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 69d23f0381fd..5a6c448a846c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1636,7 +1636,7 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe } } - if(basegfx::B2DLINEJOIN_NONE != rInfo.GetLineJoin()) + if(basegfx::B2DLineJoin::NONE != rInfo.GetLineJoin()) { // LineJoin used, ExtLineInfo required return false; @@ -10557,20 +10557,20 @@ void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter // add LineJoin switch(rIn.GetLineJoin()) { - case basegfx::B2DLINEJOIN_BEVEL : + case basegfx::B2DLineJoin::Bevel : { rOut.m_eJoin = PDFWriter::joinBevel; break; } - default : // basegfx::B2DLINEJOIN_NONE : + default : // basegfx::B2DLineJoin::NONE : // Pdf has no 'none' lineJoin, default is miter - case basegfx::B2DLINEJOIN_MIDDLE : - case basegfx::B2DLINEJOIN_MITER : + case basegfx::B2DLineJoin::Middle : + case basegfx::B2DLineJoin::Miter : { rOut.m_eJoin = PDFWriter::joinMiter; break; } - case basegfx::B2DLINEJOIN_ROUND : + case basegfx::B2DLineJoin::Round : { rOut.m_eJoin = PDFWriter::joinRound; break; diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx index f22ee2bd19aa..1a8a3f5536e8 100644 --- a/vcl/source/outdev/line.cxx +++ b/vcl/source/outdev/line.cxx @@ -134,7 +134,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine); } - if( mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this)) + if( mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this)) { return; } @@ -236,7 +236,7 @@ void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const Lin if(bTryAA) { - bDone = mpGraphics->DrawPolyLine( aCandidate, 0.0, basegfx::B2DVector(1.0,1.0), basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this); + bDone = mpGraphics->DrawPolyLine( aCandidate, 0.0, basegfx::B2DVector(1.0,1.0), basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this); } if(!bDone) diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx index e45311538269..f43c1eb78a8a 100644 --- a/vcl/source/outdev/polygon.cxx +++ b/vcl/source/outdev/polygon.cxx @@ -95,7 +95,7 @@ void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) bSuccess = mpGraphics->DrawPolyLine( aB2DPolyPolygon.getB2DPolygon(a), 0.0, aB2DLineWidth, - basegfx::B2DLINEJOIN_NONE, + basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this); } @@ -203,7 +203,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly ) bSuccess = mpGraphics->DrawPolyLine( aB2DPolygon, 0.0, aB2DLineWidth, - basegfx::B2DLINEJOIN_NONE, + basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this); } @@ -305,7 +305,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP bSuccess = mpGraphics->DrawPolyLine( aB2DPolyPolygon.getB2DPolygon(a), 0.0, aB2DLineWidth, - basegfx::B2DLINEJOIN_NONE, + basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this); } diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx index 4589e1991bc4..06ba7bc4f8ef 100644 --- a/vcl/source/outdev/polyline.cxx +++ b/vcl/source/outdev/polyline.cxx @@ -73,7 +73,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly ) } if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, - basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this)) + basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this)) { return; } @@ -208,7 +208,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, // to avoid optical gaps for(sal_uInt32 a(0); a < aAreaPolyPolygon.count(); a++) { - DrawPolyLineDirect( aAreaPolyPolygon.getB2DPolygon(a), 0.0, 0.0, basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, bTryAA ); + DrawPolyLineDirect( aAreaPolyPolygon.getB2DPolygon(a), 0.0, 0.0, basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, bTryAA ); } } else diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 7f3b355b6f8a..5c906f1c4f73 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -266,7 +266,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, for( int nPolyIdx = 0; nPolyIdx < nPolyCount; ++nPolyIdx ) { const ::basegfx::B2DPolygon aOnePoly = aB2DPolyPolygon.getB2DPolygon( nPolyIdx ); - mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLINEJOIN_NONE, com::sun::star::drawing::LineCap_BUTT, this ); + mpGraphics->DrawPolyLine( aOnePoly, fTransparency, aHairlineWidth, ::basegfx::B2DLineJoin::NONE, com::sun::star::drawing::LineCap_BUTT, this ); } } @@ -363,7 +363,7 @@ bool OutputDevice::DrawTransparentNatively ( const tools::PolyPolygon& rPolyPoly { const ::basegfx::B2DPolygon& rPolygon = aB2DPolyPolygon.getB2DPolygon( nPolyIdx ); bDrawn = mpGraphics->DrawPolyLine( rPolygon, fTransparency, aLineWidths, - ::basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this ); + ::basegfx::B2DLineJoin::NONE, css::drawing::LineCap_BUTT, this ); } // prepare to restore the fill color mbInitFillColor = mbFillColor; diff --git a/vcl/win/source/gdi/gdiimpl.cxx b/vcl/win/source/gdi/gdiimpl.cxx index e4823a2c6452..e3a400cc39ca 100644 --- a/vcl/win/source/gdi/gdiimpl.cxx +++ b/vcl/win/source/gdi/gdiimpl.cxx @@ -2078,7 +2078,7 @@ bool WinSalGraphicsImpl::drawPolyLine( switch(eLineJoin) { - default : // basegfx::B2DLINEJOIN_NONE : + default : // basegfx::B2DLineJoin::NONE : { if(basegfx::fTools::more(rLineWidths.getX(), 0.0)) { @@ -2086,20 +2086,20 @@ bool WinSalGraphicsImpl::drawPolyLine( } break; } - case basegfx::B2DLINEJOIN_BEVEL : + case basegfx::B2DLineJoin::Bevel : { Gdiplus::DllExports::GdipSetPenLineJoin(pTestPen, Gdiplus::LineJoinBevel); break; } - case basegfx::B2DLINEJOIN_MIDDLE : - case basegfx::B2DLINEJOIN_MITER : + case basegfx::B2DLineJoin::Middle : + case basegfx::B2DLineJoin::Miter : { const Gdiplus::REAL aMiterLimit(15.0); Gdiplus::DllExports::GdipSetPenMiterLimit(pTestPen, aMiterLimit); Gdiplus::DllExports::GdipSetPenLineJoin(pTestPen, Gdiplus::LineJoinMiter); break; } - case basegfx::B2DLINEJOIN_ROUND : + case basegfx::B2DLineJoin::Round : { Gdiplus::DllExports::GdipSetPenLineJoin(pTestPen, Gdiplus::LineJoinRound); break; diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index db7bad9ab541..b8631aab12ef 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -258,10 +258,10 @@ public: drawing::LineCap_BUTT, drawing::LineCap_ROUND, drawing::LineCap_SQUARE, drawing::LineCap_BUTT }; ::basegfx::B2DLineJoin eJoins[] = { - basegfx::B2DLINEJOIN_NONE, basegfx::B2DLINEJOIN_MIDDLE, basegfx::B2DLINEJOIN_BEVEL, basegfx::B2DLINEJOIN_MITER, - basegfx::B2DLINEJOIN_ROUND, basegfx::B2DLINEJOIN_NONE, basegfx::B2DLINEJOIN_MIDDLE, basegfx::B2DLINEJOIN_BEVEL, - basegfx::B2DLINEJOIN_MITER, basegfx::B2DLINEJOIN_ROUND, basegfx::B2DLINEJOIN_NONE, basegfx::B2DLINEJOIN_MIDDLE, - basegfx::B2DLINEJOIN_BEVEL, basegfx::B2DLINEJOIN_MITER, basegfx::B2DLINEJOIN_ROUND, basegfx::B2DLINEJOIN_NONE + basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Middle, basegfx::B2DLineJoin::Bevel, basegfx::B2DLineJoin::Miter, + basegfx::B2DLineJoin::Round, basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Middle, basegfx::B2DLineJoin::Bevel, + basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round, basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Middle, + basegfx::B2DLineJoin::Bevel, basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round, basegfx::B2DLineJoin::NONE }; double aLineWidths[] = { 10.0, 15.0, 20.0, 10.0, |