diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-02 15:47:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-02 16:41:23 +0000 |
| commit | c3cc55968eade5c03efca02d4f056b145cd89a70 (patch) | |
| tree | 6abe0694b4ed99f149855aad9e6b2d64cd353d81 /vcl | |
| parent | ddd77c84cfeeef96eb8662b03fa29a8103ed559e (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 1 | ||||
| -rw-r--r-- | vcl/quartz/salgdicommon.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 3 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 8 |
5 files changed, 6 insertions, 10 deletions
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, |