diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
| commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
| tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /canvas/source/cairo | |
| parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) | |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'canvas/source/cairo')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 7a918f4b38be..64686fce6bd0 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -319,7 +319,7 @@ namespace cairocanvas // TODO(F1): Add support for floating point bitmap formats uno::Reference<rendering::XIntegerReadOnlyBitmap> xIntBmp(xBitmap, uno::UNO_QUERY_THROW); - ::BitmapEx aBmpEx = ::vcl::unotools::bitmapExFromXBitmap(xIntBmp); + ::BitmapEx aBmpEx = vcl::unotools::bitmapExFromXBitmap(xIntBmp); if( !!aBmpEx ) return aBmpEx; diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 2a98ea7b6e09..92782af3cb49 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -135,7 +135,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor ); } // extract alpha, and make color opaque @@ -217,7 +217,7 @@ namespace cairocanvas if( renderState.DeviceColor.getLength() > 2 ) { - aColor = ::vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); + aColor = vcl::unotools::stdColorSpaceSequenceToColor(renderState.DeviceColor ); } // setup font color diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 684b61afcf2c..7fd8a4663334 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -113,7 +113,7 @@ namespace cairocanvas const Size aPixelSize( mpRefDevice->LogicToPixel(Size(1,1)) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aPixelSize ); + return vcl::unotools::size2DFromSize( aPixelSize ); } geometry::RealSize2D DeviceHelper::getPhysicalSize() @@ -127,7 +127,7 @@ namespace cairocanvas const Size aLogSize( mpRefDevice->PixelToLogic(mpRefDevice->GetOutputSizePixel()) ); mpRefDevice->SetMapMode( aOldMapMode ); - return ::vcl::unotools::size2DFromSize( aLogSize ); + return vcl::unotools::size2DFromSize( aLogSize ); } uno::Reference< rendering::XLinePolyPolygon2D > DeviceHelper::createCompatibleLinePolyPolygon( |