diff options
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/source/polygon/b2dpolygontools.cxx | 19 | ||||
-rw-r--r-- | basegfx/source/polygon/b3dpolygontools.cxx | 11 |
2 files changed, 11 insertions, 19 deletions
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 0483d13ee9c8..f1b9c169f345 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -1130,22 +1130,17 @@ namespace basegfx::utils pGapTarget->clear(); } - // provide callbacks as lambdas - const auto rLineCallback( - nullptr == pLineTarget - ? std::function<void(const basegfx::B2DPolygon&)>() - : [&pLineTarget](const basegfx::B2DPolygon& rSnippet){ pLineTarget->append(rSnippet); }); - const auto rGapCallback( - nullptr == pGapTarget - ? std::function<void(const basegfx::B2DPolygon&)>() - : [&pGapTarget](const basegfx::B2DPolygon& rSnippet){ pGapTarget->append(rSnippet); }); - // call version that uses callbacks applyLineDashing( rCandidate, rDotDashArray, - rLineCallback, - rGapCallback, + // provide callbacks as lambdas + (!pLineTarget + ? std::function<void(const basegfx::B2DPolygon&)>() + : [&pLineTarget](const basegfx::B2DPolygon& rSnippet){ pLineTarget->append(rSnippet); }), + (!pGapTarget + ? std::function<void(const basegfx::B2DPolygon&)>() + : [&pGapTarget](const basegfx::B2DPolygon& rSnippet){ pGapTarget->append(rSnippet); }), fDotDashLength); } diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index 2f4ed7f7d691..5f0b8c84ed9b 100644 --- a/basegfx/source/polygon/b3dpolygontools.cxx +++ b/basegfx/source/polygon/b3dpolygontools.cxx @@ -103,17 +103,14 @@ namespace basegfx::utils pLineTarget->clear(); } - // provide callback as lambda - const auto rLineCallback( - nullptr == pLineTarget - ? std::function<void(const basegfx::B3DPolygon&)>() - : [&pLineTarget](const basegfx::B3DPolygon& rSnippet){ pLineTarget->append(rSnippet); }); - // call version that uses callbacks applyLineDashing( rCandidate, rDotDashArray, - rLineCallback, + // provide callback as lambda + (!pLineTarget + ? std::function<void(const basegfx::B3DPolygon&)>() + : [&pLineTarget](const basegfx::B3DPolygon& rSnippet){ pLineTarget->append(rSnippet); }), fDotDashLength); } |