diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-09-14 21:26:21 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-09-30 09:38:51 +0200 |
| commit | f89ebad04011b38f21ffb0b19cd3e89465449954 (patch) | |
| tree | 4ecdafae31479de414cc1fca752dcececf95ed56 /canvas | |
| parent | lok: Bullets and Numbering → disable Graphic selection in Customize (diff) | |
| download | core-f89ebad04011b38f21ffb0b19cd3e89465449954.tar.gz core-f89ebad04011b38f21ffb0b19cd3e89465449954.zip | |
lok jsdialogs: Introduce dumping of widgets hierarchy to vcl::Window.
Change-Id: Ie3267e1f888df371d281e81ead437a150aa8dc1c
Reviewed-on: https://gerrit.libreoffice.org/79688
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 2902c2e9b8db..cc81138a9361 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -394,7 +394,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(&lcl_drawLine, - _1, _2, _3, _4, _5, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, aStartPoint, aEndPoint); } } @@ -414,7 +414,7 @@ namespace oglcanvas // TODO(F2): subdivide&render whole curve rAct.maFunction = std::bind(&lcl_drawLine, - _1,_2,_3,_4,_5, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, geometry::RealPoint2D( aBezierSegment.Px, aBezierSegment.Py), @@ -567,10 +567,10 @@ namespace oglcanvas pGradient->getValues() ); rAct.maFunction = std::bind(&lcl_fillGradientPolyPolygon, - _1,_2,_3,_4, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, rValues, textures[0], - _6); + std::placeholders::_6); } else { @@ -610,14 +610,14 @@ namespace oglcanvas canvas::tools::getStdColorSpace())); rAct.maFunction = std::bind(&lcl_fillTexturedPolyPolygon, - _1,_2,_3,_4, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, textures[0], aSize, aARGBBytes, rtl_crc32(0, aARGBBytes.getConstArray(), aARGBBytes.getLength()), - _6); + std::placeholders::_6); } // TODO(F1): handle non-integer case } @@ -790,7 +790,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(&lcl_drawOwnBitmap, - _1,_2,_3,_4,_5, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, *pOwnBitmap); } else @@ -819,7 +819,7 @@ namespace oglcanvas setupGraphicsState( rAct, viewState, renderState ); rAct.maFunction = std::bind(&lcl_drawGenericBitmap, - _1,_2,_3,_4,_5, + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, aSize, aARGBBytes, rtl_crc32(0, aARGBBytes.getConstArray(), |