diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:55:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:01:23 +0000 |
| commit | 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch) | |
| tree | 3f669db44367a2a072b899a1a1b87eb25ee607af /canvas/source/cairo/cairo_spritecanvashelper.cxx | |
| parent | 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff) | |
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'canvas/source/cairo/cairo_spritecanvashelper.cxx')
| -rw-r--r-- | canvas/source/cairo/cairo_spritecanvashelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 8ffa34e4da9c..7f419e02e66c 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -266,7 +266,7 @@ namespace cairocanvas ::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) ); ::basegfx::B2IPoint aDestPos( rDestRect.getMinimum() ); - ::std::vector< ::basegfx::B2IRange > aUnscrollableAreas; + std::vector< ::basegfx::B2IRange > aUnscrollableAreas; // TODO(E3): This is plain buggy (but copies the behaviour of // the old Impress slideshow) - the scrolled area might @@ -352,7 +352,7 @@ namespace cairocanvas // repaint uncovered areas from backbuffer - take the // _rounded_ rectangles from above, to have the update // consistent with the scroll above. - ::std::vector< ::basegfx::B2DRange > aUncoveredAreas; + std::vector< ::basegfx::B2DRange > aUncoveredAreas; ::basegfx::computeSetDifference( aUncoveredAreas, rUpdateArea.maTotalBounds, ::basegfx::B2DRange( rDestRect ) ); @@ -370,7 +370,7 @@ namespace cairocanvas } void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea, - const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) + const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { ENSURE_OR_THROW( mpOwningSpriteCanvas && mpOwningSpriteCanvas->getBufferSurface(), @@ -415,7 +415,7 @@ namespace cairocanvas } void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rRequestedArea, - const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) + const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ) { // TODO SAL_INFO("canvas.cairo", "SpriteCanvasHelper::genericUpdate called"); @@ -437,17 +437,17 @@ namespace cairocanvas // otherwise, truncation of size below might leave visible // areas uncovered by VDev. const Point aOutputPosition( - ::std::max( sal_Int32( 0 ), + std::max( sal_Int32( 0 ), static_cast< sal_Int32 >(rRequestedArea.getMinX()) ), - ::std::max( sal_Int32( 0 ), + std::max( sal_Int32( 0 ), static_cast< sal_Int32 >(rRequestedArea.getMinY()) ) ); // round output size towards +infty. Don't want to truncate a // fraction of a sprite pixel... Limit size of VDev to output // device's area. const Size aOutputSize( - ::std::min( rSize.getX(), + std::min( rSize.getX(), ::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X()) ), - ::std::min( rSize.getY(), + std::min( rSize.getY(), ::canvas::tools::roundUp( rRequestedArea.getMaxY() - aOutputPosition.Y()) ) ); cairo_rectangle( pCompositingCairo.get(), aOutputPosition.X(), aOutputPosition.Y(), aOutputSize.Width(), aOutputSize.Height() ); |