From c3cc55968eade5c03efca02d4f056b145cd89a70 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 2 Feb 2016 15:47:41 +0000 Subject: remove B2DLineJoin::Middle and consistently map css::drawing::LineJoint_MIDDLE to the same thing that css::drawing::LineJoint_MITRE points to everywhere else Change-Id: I77b7586ea13f3fe84c0529172758256666488d36 --- cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 ++-- cui/source/tabpages/tpline.cxx | 2 +- drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 5 ++--- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 3 +-- filter/source/graphicfilter/eps/eps.cxx | 2 +- filter/source/msfilter/escherex.cxx | 2 +- filter/source/svg/svgwriter.cxx | 4 ++-- include/basegfx/vector/b2enums.hxx | 10 +++++----- oox/source/export/drawingml.cxx | 2 +- svx/source/sdr/attribute/sdrformtextattribute.cxx | 5 +---- svx/source/sdr/primitive2d/sdrattributecreator.cxx | 5 +---- svx/source/sidebar/line/LinePropertyPanelBase.cxx | 2 +- svx/source/svdraw/svdfmtf.cxx | 5 +---- vcl/headless/svpgdi.cxx | 1 - vcl/quartz/salgdicommon.cxx | 1 - vcl/source/gdi/pdfwriter_impl.cxx | 3 +-- vcl/win/gdi/gdiimpl.cxx | 3 +-- vcl/workben/vcldemo.cxx | 8 ++++---- 18 files changed, 26 insertions(+), 41 deletions(-) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 31cd771ceb44..c07ee3497a0f 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -120,9 +120,9 @@ namespace o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT; o_rStrokeAttributes.EndCapType = rendering::PathCapType::BUTT; - switch(rLineInfo.GetLineJoin()) + switch (rLineInfo.GetLineJoin()) { - default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::NONE: o_rStrokeAttributes.JoinType = rendering::PathJoinType::NONE; break; case basegfx::B2DLineJoin::Bevel: diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 3f33c73c3298..944b0a4249cd 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1451,9 +1451,9 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) switch(eLineJoint) { case css::drawing::LineJoint_MAKE_FIXED_SIZE: // fallback to round, unused value - case css::drawing::LineJoint_MIDDLE : // fallback to round, unused value case css::drawing::LineJoint_ROUND : m_pLBEdgeStyle->SelectEntryPos(0); break; case css::drawing::LineJoint_NONE : m_pLBEdgeStyle->SelectEntryPos(1); break; + case css::drawing::LineJoint_MIDDLE : // fallback to mitre, unused value case css::drawing::LineJoint_MITER : m_pLBEdgeStyle->SelectEntryPos(2); break; case css::drawing::LineJoint_BEVEL : m_pLBEdgeStyle->SelectEntryPos(3); break; } diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 2148fa075bc8..a6aa2cddde70 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -325,9 +325,8 @@ namespace drawinglayer } } - if(basegfx::B2DLineJoin::Middle == aLineJoin - || basegfx::B2DLineJoin::Bevel == aLineJoin - || basegfx::B2DLineJoin::Miter == aLineJoin) + if (basegfx::B2DLineJoin::Bevel == aLineJoin || + basegfx::B2DLineJoin::Miter == aLineJoin) { if(basegfx::B2DLineJoin::Miter == aLineJoin) { diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index f8c3e8054c90..bd24eedcb218 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -455,7 +455,7 @@ namespace drawinglayer // get Join switch(pLineAttribute->getLineJoin()) { - default : // basegfx::B2DLineJoin::NONE : + case basegfx::B2DLineJoin::NONE : { eJoin = SvtGraphicStroke::joinNone; break; @@ -465,7 +465,6 @@ namespace drawinglayer eJoin = SvtGraphicStroke::joinBevel; break; } - case basegfx::B2DLineJoin::Middle : case basegfx::B2DLineJoin::Miter : { eJoin = SvtGraphicStroke::joinMiter; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 7c763b473137..aa0f76b9bf56 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2462,7 +2462,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) switch(rLineInfo.GetLineJoin()) { - default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::NONE: // do NOT use SvtGraphicStroke::joinNone here // since it will be written as numerical value directly // and is NOT a valid EPS value diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 2e8f26303773..1ee99db17f67 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1092,11 +1092,11 @@ void EscherPropertyContainer::CreateLineProperties( switch ( eLJ ) { case css::drawing::LineJoint_NONE : - case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_BEVEL : eLineJoin = ESCHER_LineJoinBevel; break; default: + case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_MITER : eLineJoin = ESCHER_LineJoinMiter; break; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 3baee145fcbc..441197a56cb7 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1900,7 +1900,7 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs, // support for LineJoint switch(rAttrs.GetLineJoin()) { - default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::NONE: case basegfx::B2DLineJoin::Miter: { mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter"); @@ -1989,7 +1989,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp // support for LineJoin switch(rShape.maLineJoin) { - default: // B2DLineJoin::NONE, B2DLineJoin::Middle + case basegfx::B2DLineJoin::NONE: case basegfx::B2DLineJoin::Miter: { // miter is Svg default, so no need to write until the exporter might write styles. diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx index 6383861479a8..50bc358bd0ee 100644 --- a/include/basegfx/vector/b2enums.hxx +++ b/include/basegfx/vector/b2enums.hxx @@ -56,11 +56,11 @@ namespace basegfx */ enum class B2DLineJoin { - NONE, // no rounding - Middle, // calc middle value between joints - Bevel, // join edges with line - Miter, // extend till cut - Round // create arc + NONE = 0, // no rounding + // removed unused Middle join type + Bevel = 2, // join edges with line + Miter = 3, // extend till cut + Round = 4 // create arc }; } // end of namespace basegfx diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 4d8672692c0a..282436b351fe 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -747,11 +747,11 @@ void DrawingML::WriteOutline( Reference rXPropSet ) switch( eLineJoint ) { case LineJoint_NONE: - case LineJoint_MIDDLE: case LineJoint_BEVEL: mpFS->singleElementNS( XML_a, XML_bevel, FSEND ); break; default: + case LineJoint_MIDDLE: case LineJoint_MITER: mpFS->singleElementNS( XML_a, XML_miter, FSEND ); break; diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 723986f62ab4..3b92f642b53b 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -56,14 +56,11 @@ namespace { switch(eLineJoint) { - case css::drawing::LineJoint_MIDDLE : - { - return basegfx::B2DLineJoin::Middle; - } case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } + case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index e25d6346a02d..7bd9d28014c5 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -136,14 +136,11 @@ namespace drawinglayer { switch(eLineJoint) { - case css::drawing::LineJoint_MIDDLE : - { - return basegfx::B2DLineJoin::Middle; - } case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } + case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 6de2dcb09c9d..013d8e4fbbc3 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -462,7 +462,6 @@ void LinePropertyPanelBase::updateLineJoint(bool bDisabled, bool bSetOrDefault, switch(pItem->GetValue()) { - case drawing::LineJoint_MIDDLE: case drawing::LineJoint_ROUND: { nEntryPos = 1; @@ -473,6 +472,7 @@ void LinePropertyPanelBase::updateLineJoint(bool bDisabled, bool bSetOrDefault, nEntryPos = 2; break; } + case drawing::LineJoint_MIDDLE: case drawing::LineJoint_MITER: { nEntryPos = 3; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index cfea596f881a..ace66d914d70 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -355,12 +355,9 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr switch(maLineJoin) { - default : // basegfx::B2DLineJoin::NONE + case basegfx::B2DLineJoin::NONE: mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_NONE)); break; - case basegfx::B2DLineJoin::Middle: - mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_MIDDLE)); - break; case basegfx::B2DLineJoin::Bevel: mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_BEVEL)); break; diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index fb7a0695af2d..9769f9132767 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -707,7 +707,6 @@ bool SvpSalGraphics::drawPolyLine( eCairoLineJoin = CAIRO_LINE_JOIN_ROUND; break; case basegfx::B2DLineJoin::NONE: - case basegfx::B2DLineJoin::Middle: case basegfx::B2DLineJoin::Miter: eCairoLineJoin = CAIRO_LINE_JOIN_MITER; break; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index cf999090d25a..742f31c45927 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -996,7 +996,6 @@ bool AquaSalGraphics::drawPolyLine( const basegfx::B2DPolygon& rPolyLine, 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; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index a26d5ff46df2..de67de67cc44 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10541,9 +10541,8 @@ void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter rOut.m_eJoin = PDFWriter::joinBevel; break; } - default : // basegfx::B2DLineJoin::NONE : // Pdf has no 'none' lineJoin, default is miter - case basegfx::B2DLineJoin::Middle : + case basegfx::B2DLineJoin::NONE : case basegfx::B2DLineJoin::Miter : { rOut.m_eJoin = PDFWriter::joinMiter; diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 5c13028f6848..35e2fbf9ca4e 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -2052,7 +2052,7 @@ bool WinSalGraphicsImpl::drawPolyLine( switch(eLineJoin) { - default : // basegfx::B2DLineJoin::NONE : + case basegfx::B2DLineJoin::NONE : { if(basegfx::fTools::more(rLineWidths.getX(), 0.0)) { @@ -2065,7 +2065,6 @@ bool WinSalGraphicsImpl::drawPolyLine( Gdiplus::DllExports::GdipSetPenLineJoin(pTestPen, Gdiplus::LineJoinBevel); break; } - case basegfx::B2DLineJoin::Middle : case basegfx::B2DLineJoin::Miter : { const Gdiplus::REAL aMiterLimit(15.0); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 3b3ddeb4bfef..aa5140fad08c 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -266,10 +266,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::Bevel, basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round, + basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Bevel, basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round, + basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Bevel, basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round, + basegfx::B2DLineJoin::NONE, basegfx::B2DLineJoin::Bevel, basegfx::B2DLineJoin::Miter, basegfx::B2DLineJoin::Round }; double aLineWidths[] = { 10.0, 15.0, 20.0, 10.0, -- cgit