summaryrefslogtreecommitdiff
path: root/canvas/source/opengl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-09-14 21:26:21 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2019-10-01 10:21:08 +0200
commit75b8db7fa7344a679d3c5dbdc8c5bd4228cdbc7c (patch)
tree26f0c24aa1c5d4dacb3e1a019a0a30441fc8f7e2 /canvas/source/opengl
parent9590e8d0a2194b36d5a025a21dc2e71f37f4f54b (diff)
lok jsdialogs: Introduce dumping of widgets hierarchy to vcl::Window.
Change-Id: Ie3267e1f888df371d281e81ead437a150aa8dc1c Reviewed-on: https://gerrit.libreoffice.org/79796 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'canvas/source/opengl')
-rw-r--r--canvas/source/opengl/ogl_canvashelper.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index cbbd639741f6..e5966e3e9ebe 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -395,7 +395,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);
}
}
@@ -415,7 +415,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),
@@ -568,10 +568,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
{
@@ -611,14 +611,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
}
@@ -791,7 +791,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
@@ -820,7 +820,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(),