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 --- drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 5 ++--- drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'drawinglayer') 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; -- cgit