diff options
Diffstat (limited to 'canvas/workben/canvasdemo.cxx')
| -rw-r--r-- | canvas/workben/canvasdemo.cxx | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 031068adf9e9..3ec7a3d6df75 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -39,6 +39,7 @@ #include <comphelper/random.hxx> #include <cppuhelper/bootstrap.hxx> #include <o3tl/safeint.hxx> +#include <utility> #include <vcl/canvastools.hxx> #include <vcl/svapp.hxx> #include <vcl/vclmain.hxx> @@ -92,7 +93,7 @@ class DemoRenderer maColorBlack( vcl::unotools::colorToStdColorSpaceSequence( COL_BLACK) ), maColorRed( vcl::unotools::colorToStdColorSpaceSequence( COL_RED) ), mxCanvas(xCanvas), - mxDevice( xDevice ) + mxDevice(std::move( xDevice )) { // Geometry init geometry::AffineMatrix2D aUnit( 1,0, 0, @@ -181,7 +182,7 @@ class DemoRenderer const double RADIUS = 60.0; int i, j; - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( center_x, center_y ); for (i = 0; i < VERTICES; i++) @@ -201,14 +202,14 @@ class DemoRenderer } } - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawHilbert( double anchor_x, double anchor_y ) { const double SCALE=7.0; const char hilbert[] = "urdrrulurulldluuruluurdrurddldrrruluurdrurddldrddlulldrdldrrurd"; - int nLength = SAL_N_ELEMENTS( hilbert ); + int nLength = std::size( hilbert ); uno::Sequence< geometry::RealPoint2D > aPoints( nLength ); auto pPoints = aPoints.getArray(); @@ -268,9 +269,9 @@ class DemoRenderer void drawRectangles() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push - drawTitle( OString( "Rectangles" ) ); + drawTitle( "Rectangles"_ostr ); drawRect( tools::Rectangle( 20, 30, 70, 60 ), maColorRed, 8 ); // color mediumseagreen, stipple fill, outline black @@ -278,15 +279,15 @@ class DemoRenderer // color steelblue, filled, no outline drawRect( tools::Rectangle( 10, 80, 80, 140 ), maColorBlack, 1 ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawEllipses() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width(), 0.0 ); - drawTitle( OString( "Ellipses" ) ); + drawTitle( "Ellipses"_ostr ); const basegfx::B2DPoint aCenter( maBox.Width()*.5, maBox.Height()*.5 ); @@ -309,29 +310,29 @@ class DemoRenderer aStrokeAttrs.JoinType = rendering::PathJoinType::MITER; mxCanvas->strokePolyPolygon( xPoly, maViewState, maRenderState, aStrokeAttrs ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawText() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width() * 2.0, 0.0 ); - drawTitle( OString( "Text" ) ); + drawTitle( "Text"_ostr ); translate( 0.0, maBox.Height() * .5 ); - drawTitle( OString( "This is lame" ) ); + drawTitle( "This is lame"_ostr ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawImages() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( 0.0, maBox.Height() ); - drawTitle( OString( "Images" ) ); + drawTitle( "Images"_ostr ); uno::Reference< rendering::XBitmap > xBitmap(mxCanvas, uno::UNO_QUERY); @@ -356,28 +357,28 @@ class DemoRenderer //bitmapExFromXBitmap(): could not extract bitmap' thrown // Thorsten says that this is a bug, and Thorsten never lies. - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawLines() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width(), maBox.Height() ); - drawTitle( OString( "Lines" ) ); + drawTitle( "Lines"_ostr ); drawPolishDiamond( 70.0, 80.0 ); drawHilbert( 140.0, 140.0 ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawCurves() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width() * 2.0, maBox.Height() ); - drawTitle( OString( "Curves" ) ); + drawTitle( "Curves"_ostr ); translate( maBox.Width() * .5, maBox.Height() * .5 ); @@ -412,7 +413,7 @@ class DemoRenderer //you can't draw a BezierPolyPolygon2D with this, even though it is derived from it //mxCanvas->drawPolyPolygon( xPoly, maViewState, maRenderState ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } double gimmerand() @@ -422,10 +423,10 @@ class DemoRenderer void drawArcs() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( 0.0, maBox.Height() * 2.0 ); - drawTitle( OString( "Arcs" ) ); + drawTitle( "Arcs"_ostr ); //begin hacks @@ -471,7 +472,7 @@ class DemoRenderer aEndPoint, maViewState, maRenderState ); } - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } @@ -500,10 +501,10 @@ class DemoRenderer void drawPolygons() { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width() * 1.0, maBox.Height() * 2.0 ); - drawTitle( OString( "Polygons" ) ); + drawTitle( "Polygons"_ostr ); int sides= 3; for (int i= 1; i <= 4; i++) @@ -512,17 +513,17 @@ class DemoRenderer sides++; } - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } void drawWidgets() // FIXME: prolly makes no sense { - rendering::RenderState maOldRenderState = maRenderState; // push + rendering::RenderState aOldRenderState = maRenderState; // push translate( maBox.Width() * 2.0, maBox.Height() * 2.0 ); - drawTitle( OString( "Widgets" ) ); + drawTitle( "Widgets"_ostr ); - maRenderState = maOldRenderState; // pop + maRenderState = std::move(aOldRenderState); // pop } }; |