diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-05-26 11:03:06 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-05-26 15:55:37 +0200 |
| commit | 3a93748c9c4faadeb9ab4eb21706d187677549fa (patch) | |
| tree | a89371682cb4729a15df1630cf26a19fb6d0e8aa /vcl/inc | |
| parent | 6cd885b46bf168a1fe0d91231a1b6d283f813ed3 (diff) | |
use Skia to do dashed lines, no need to do it manually (tdf#130431)
Change-Id: Id5efe7227f3c2bcb5ef6f1b990327e72014e8c47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94857
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/skia/gdiimpl.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/test/outputdevice.hxx | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx index c78845fe6ffa..eb5fbdbdcbf8 100644 --- a/vcl/inc/skia/gdiimpl.hxx +++ b/vcl/inc/skia/gdiimpl.hxx @@ -104,9 +104,9 @@ public: virtual bool drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice, const basegfx::B2DPolygon&, double fTransparency, double fLineWidth, - const std::vector<double>* pStroke, // MM01 - basegfx::B2DLineJoin, css::drawing::LineCap, - double fMiterMinimumAngle, bool bPixelSnapHairline) override; + const std::vector<double>* pStroke, basegfx::B2DLineJoin, + css::drawing::LineCap, double fMiterMinimumAngle, + bool bPixelSnapHairline) override; virtual bool drawPolyLineBezier(sal_uInt32 nPoints, const SalPoint* pPtAry, const PolyFlags* pFlgAry) override; diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx index b6cf70c22bd0..b8ad0b67fc6b 100644 --- a/vcl/inc/test/outputdevice.hxx +++ b/vcl/inc/test/outputdevice.hxx @@ -60,6 +60,7 @@ public: static TestResult checkInvertTrackFrameRectangle(Bitmap& aBitmap); static TestResult checkRectangles(Bitmap& rBitmap, std::vector<Color>& aExpectedColors); + static TestResult checkRectangle(Bitmap& rBitmap, int aLayerNumber, Color aExpectedColor); static TestResult checkFilled(Bitmap& rBitmap, tools::Rectangle aRectangle, Color aExpectedColor); static TestResult checkChecker(Bitmap& rBitmap, sal_Int32 nStartX, sal_Int32 nEndX, @@ -125,6 +126,9 @@ public: Bitmap setupDiamond(); Bitmap setupLines(); Bitmap setupAALines(); + + Bitmap setupDashedLine(); + static TestResult checkDashedLine(Bitmap& rBitmap); }; class VCL_DLLPUBLIC OutputDeviceTestPolyLine : public OutputDeviceTestCommon |