From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 15 Feb 2017 23:55:18 +0200
Subject: 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>
---
 canvas/source/opengl/ogl_canvashelper.cxx | 20 ++++++++++----------
 canvas/source/opengl/ogl_textlayout.cxx   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'canvas/source/opengl')

diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 67707bba4c59..d2edda651e4f 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -38,7 +38,7 @@
 #include "ogl_canvashelper.hxx"
 
 using namespace ::com::sun::star;
-using namespace ::std::placeholders;
+using namespace std::placeholders;
 
 namespace oglcanvas
 {
@@ -81,7 +81,7 @@ namespace oglcanvas
         rendering::ARGBColor            maARGBColor;
         ::basegfx::B2DPolyPolygonVector maPolyPolys;
 
-        ::std::function< bool (
+        std::function< bool (
                             const CanvasHelper&,
                             const ::basegfx::B2DHomMatrix&,
                             GLenum,
@@ -409,7 +409,7 @@ namespace oglcanvas
             Action& rAct=mpRecordedActions->back();
 
             setupGraphicsState( rAct, viewState, renderState );
-            rAct.maFunction = ::std::bind(&lcl_drawPoint,
+            rAct.maFunction = std::bind(&lcl_drawPoint,
                                             _1,_2,_3,_4,_5,
                                             aPoint);
         }
@@ -427,7 +427,7 @@ namespace oglcanvas
             Action& rAct=mpRecordedActions->back();
 
             setupGraphicsState( rAct, viewState, renderState );
-            rAct.maFunction = ::std::bind(&lcl_drawLine,
+            rAct.maFunction = std::bind(&lcl_drawLine,
                                           _1, _2, _3, _4, _5,
                                           aStartPoint, aEndPoint);
         }
@@ -447,7 +447,7 @@ namespace oglcanvas
             setupGraphicsState( rAct, viewState, renderState );
 
             // TODO(F2): subdivide&render whole curve
-            rAct.maFunction = ::std::bind(&lcl_drawLine,
+            rAct.maFunction = std::bind(&lcl_drawLine,
                                             _1,_2,_3,_4,_5,
                                             geometry::RealPoint2D(
                                                 aBezierSegment.Px,
@@ -600,7 +600,7 @@ namespace oglcanvas
                     const ::canvas::ParametricPolyPolygon::Values& rValues(
                         pGradient->getValues() );
 
-                    rAct.maFunction = ::std::bind(&lcl_fillGradientPolyPolygon,
+                    rAct.maFunction = std::bind(&lcl_fillGradientPolyPolygon,
                                                     _1,_2,_3,_4,
                                                     rValues,
                                                     textures[0],
@@ -643,7 +643,7 @@ namespace oglcanvas
                                 aPixelData,
                                 canvas::tools::getStdColorSpace()));
 
-                        rAct.maFunction = ::std::bind(&lcl_fillTexturedPolyPolygon,
+                        rAct.maFunction = std::bind(&lcl_fillTexturedPolyPolygon,
                                                         _1,_2,_3,_4,
                                                         textures[0],
                                                         aSize,
@@ -764,7 +764,7 @@ namespace oglcanvas
                 {
                     // create the DXArray
                     const sal_Int32 nLen( aLogicalAdvancements.getLength() );
-                    ::std::unique_ptr<long[]> pDXArray( new long[nLen] );
+                    std::unique_ptr<long[]> pDXArray( new long[nLen] );
                     for( sal_Int32 i=0; i<nLen; ++i )
                         pDXArray[i] = basegfx::fround( aLogicalAdvancements[i] );
 
@@ -820,7 +820,7 @@ namespace oglcanvas
                 Action& rAct=mpRecordedActions->back();
 
                 setupGraphicsState( rAct, viewState, renderState );
-                rAct.maFunction = ::std::bind(&lcl_drawOwnBitmap,
+                rAct.maFunction = std::bind(&lcl_drawOwnBitmap,
                                                 _1,_2,_3,_4,_5,
                                                 *pOwnBitmap);
             }
@@ -849,7 +849,7 @@ namespace oglcanvas
                     Action& rAct=mpRecordedActions->back();
 
                     setupGraphicsState( rAct, viewState, renderState );
-                    rAct.maFunction = ::std::bind(&lcl_drawGenericBitmap,
+                    rAct.maFunction = std::bind(&lcl_drawGenericBitmap,
                                                     _1,_2,_3,_4,_5,
                                                     aSize, aARGBBytes,
                                                     rtl_crc32(0,
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index 0331c8c9d2ba..5857367938e5 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -85,7 +85,7 @@ namespace oglcanvas
         // fake text bounds by either taking the advancement values,
         // or assuming square glyph boxes (width similar to height)
         const rendering::FontRequest& rFontRequest( mpFont->getFontRequest() );
-        const double nFontSize( ::std::max( rFontRequest.CellSize,
+        const double nFontSize( std::max( rFontRequest.CellSize,
                                             rFontRequest.ReferenceAdvancement ) );
         if( maLogicalAdvancements.getLength() )
         {
-- 
cgit