summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-28 23:09:13 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-30 07:27:52 +0300
commitd883c12556a71c5d3719454b1f95809a505f0ace (patch)
tree6f0c1cc518a3727db95b72d609ec9db793041b20 /cppcanvas
parentd1ca0f4ed0e30394ce6759a20d4896651dd43051 (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 'cppcanvas')
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx4
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx16
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx78
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx14
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx2
-rw-r--r--cppcanvas/source/wrapper/vclfactory.cxx2
8 files changed, 60 insertions, 60 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 7514bc4205b5..e264d7791ca1 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -241,7 +241,7 @@ static float GetSwapFloat( SvStream& rSt )
static ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation,
- const ::vcl::Font& rFont,
+ const vcl::Font& rFont,
const ActionFactoryParameters& rParms );
bool createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 14fea4effaec..fb0eb33ffec9 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -85,7 +85,7 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) :
CachedPrimitiveBase( rCanvas, true ),
- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+ mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
rBmpEx ) ),
mpCanvas( rCanvas ),
maState()
@@ -113,7 +113,7 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) :
CachedPrimitiveBase( rCanvas, true ),
- mxBitmap( ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
+ mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(),
rBmpEx ) ),
mpCanvas( rCanvas ),
maState()
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 5afa0b27d691..de2812487ca7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1259,7 +1259,7 @@ namespace cppcanvas
}
#define COLOR(x) \
- ::vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
+ vcl::unotools::colorToDoubleSequence( ::Color (0xff - (x >> 24), \
(x >> 16) & 0xff, \
(x >> 8) & 0xff, \
x & 0xff), \
@@ -1336,7 +1336,7 @@ namespace cppcanvas
{
fillColor = brush->secondColor;
}
- rState.fillColor = ::vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
+ rState.fillColor = vcl::unotools::colorToDoubleSequence(fillColor, rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
pPolyAction = ActionSharedPtr ( internal::PolyPolyActionFactory::createPolyPolyAction( localPolygon, rParms.mrCanvas, rState ) );
}
else if (brush->type == 3 || brush->type == 4)
@@ -1399,10 +1399,10 @@ namespace cppcanvas
OUString aGradientService;
const uno::Sequence< double > aStartColor(
- ::vcl::unotools::colorToDoubleSequence( brush->solidColor,
+ vcl::unotools::colorToDoubleSequence( brush->solidColor,
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) );
const uno::Sequence< double > aEndColor(
- ::vcl::unotools::colorToDoubleSequence( brush->secondColor,
+ vcl::unotools::colorToDoubleSequence( brush->secondColor,
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() ) );
uno::Sequence< uno::Sequence < double > > aColors (2);
uno::Sequence< double > aStops (2);
@@ -1435,7 +1435,7 @@ namespace cppcanvas
for (int i = 0; i < brush->colorblendPoints; i++) {
aStops[i] = brush->colorblendPositions [i];
- aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = ::vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i],
+ aColors[(brush->type == 4) ? i : brush->colorblendPoints - 1 - i] = vcl::unotools::colorToDoubleSequence( brush->colorblendColors [i],
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
} else {
@@ -1591,7 +1591,7 @@ namespace cppcanvas
{
rState.isFillColorSet = false;
rState.isLineColorSet = true;
- rState.lineColor = ::vcl::unotools::colorToDoubleSequence (pen->GetColor (),
+ rState.lineColor = vcl::unotools::colorToDoubleSequence (pen->GetColor (),
rCanvas->getUNOCanvas ()->getDevice()->getDeviceColorSpace());
basegfx::B2DPolyPolygon aPolyPolygon(polygon);
@@ -2169,7 +2169,7 @@ namespace cppcanvas
TextActionFactory::createTextAction(
// position is just rough guess for now
// we should calculate it exactly from layoutRect or font
- ::vcl::unotools::pointFromB2DPoint ( point ),
+ vcl::unotools::pointFromB2DPoint ( point ),
::Size(),
::Color(),
::Size(),
@@ -2426,7 +2426,7 @@ namespace cppcanvas
ActionSharedPtr pTextAction(
TextActionFactory::createTextAction(
- ::vcl::unotools::pointFromB2DPoint ( point ),
+ vcl::unotools::pointFromB2DPoint ( point ),
::Size(),
::Color(),
::Size(),
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9aeabbaefde3..c5febd08e614 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -103,7 +103,7 @@ namespace
aColor.SetTransparency(0);
//aColor.SetTransparency(128);
- rColorSequence = ::vcl::unotools::colorToDoubleSequence(
+ rColorSequence = vcl::unotools::colorToDoubleSequence(
aColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
@@ -545,10 +545,10 @@ namespace cppcanvas
uno::Reference<rendering::XColorSpace> xColorSpace(
rParms.mrCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
const uno::Sequence< double > aStartColor(
- ::vcl::unotools::colorToDoubleSequence( aVCLStartColor,
+ vcl::unotools::colorToDoubleSequence( aVCLStartColor,
xColorSpace ));
const uno::Sequence< double > aEndColor(
- ::vcl::unotools::colorToDoubleSequence( aVCLEndColor,
+ vcl::unotools::colorToDoubleSequence( aVCLEndColor,
xColorSpace ));
uno::Sequence< uno::Sequence < double > > aColors(2);
@@ -851,7 +851,7 @@ namespace cppcanvas
else
aFontMatrix.m11 *= nScaleY / nScaleX;
}
- aFontRequest.CellSize = (rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY();
+ aFontRequest.CellSize = (rState.mapModeTransform * vcl::unotools::b2DSizeFromSize(rFontSizeLog)).getY();
return rParms.mrCanvas->getUNOCanvas()->createFont( aFontRequest,
uno::Sequence< beans::PropertyValue >(),
@@ -898,7 +898,7 @@ namespace cppcanvas
aShadowOffset.setHeight( nShadowOffset );
// determine shadow color (from outdev3.cxx)
- ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor(
+ ::Color aTextColor = vcl::unotools::doubleSequenceToColor(
rState.textColor, xColorSpace );
bool bIsDark = (aTextColor.GetColor() == COL_BLACK)
|| (aTextColor.GetLuminance() < 8);
@@ -922,7 +922,7 @@ namespace cppcanvas
aReliefOffset.setHeight( nReliefOffset );
// determine relief color (from outdev3.cxx)
- ::Color aTextColor = ::vcl::unotools::doubleSequenceToColor(
+ ::Color aTextColor = vcl::unotools::doubleSequenceToColor(
rState.textColor, xColorSpace );
aReliefColor = ::Color( COL_LIGHTGRAY );
@@ -934,7 +934,7 @@ namespace cppcanvas
{
aTextColor = ::Color( COL_WHITE );
rParms.mrStates.getState().textColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
aTextColor, xColorSpace );
}
@@ -1435,7 +1435,7 @@ namespace cppcanvas
aColor.SetTransparency(0);
rStates.getState().textColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
aColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
@@ -1728,7 +1728,7 @@ namespace cppcanvas
aTexture.Alpha = 1.0 - aFill.getTransparency();
aTexture.Bitmap =
- ::vcl::unotools::xBitmapFromBitmapEx(
+ vcl::unotools::xBitmapFromBitmapEx(
rCanvas->getUNOCanvas()->getDevice(),
aBmpEx );
if( aFill.isTiling() )
@@ -1817,7 +1817,7 @@ namespace cppcanvas
{
ActionSharedPtr pPointAction(
internal::PointActionFactory::createPointAction(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ),
rCanvas,
rState ) );
@@ -1842,7 +1842,7 @@ namespace cppcanvas
{
ActionSharedPtr pPointAction(
internal::PointActionFactory::createPointAction(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint(
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ),
rCanvas,
rState,
@@ -1871,9 +1871,9 @@ namespace cppcanvas
const LineInfo& rLineInfo( pLineAct->GetLineInfo() );
const ::basegfx::B2DPoint aStartPoint(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() ));
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetStartPoint() ));
const ::basegfx::B2DPoint aEndPoint(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
ActionSharedPtr pLineAction;
@@ -1944,9 +1944,9 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() );
const ::basegfx::B2DPoint aTopLeftPixel(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) );
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ) );
const ::basegfx::B2DPoint aBottomRightPixel(
- rState.mapModeTransform * ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
// #121100# OutputDevice::DrawRect() fills
// rectangles Apple-like, i.e. with one
// additional pixel to the right and bottom.
@@ -1970,8 +1970,8 @@ namespace cppcanvas
::basegfx::B2DPolygon aPoly(
::basegfx::tools::createPolygonFromRect(
::basegfx::B2DRange(
- ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
- ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
+ vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
::basegfx::B2DPoint(1,1) ),
( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetHorzRound() ) / rRect.GetWidth(),
( (double) static_cast<MetaRoundRectAction*>(pCurrAct)->GetVertRound() ) / rRect.GetHeight() ) );
@@ -1991,8 +1991,8 @@ namespace cppcanvas
break;
const ::basegfx::B2DRange aRange(
- ::vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
- ::vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
+ vcl::unotools::b2DPointFromPoint( rRect.TopLeft() ),
+ vcl::unotools::b2DPointFromPoint( rRect.BottomRight() ) +
::basegfx::B2DPoint(1,1) );
::basegfx::B2DPolygon aPoly(
@@ -2140,7 +2140,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2164,9 +2164,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2197,9 +2197,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2223,7 +2223,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2247,9 +2247,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2280,9 +2280,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2312,7 +2312,7 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rCanvas,
rStates.getState() ) );
@@ -2342,9 +2342,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2380,9 +2380,9 @@ namespace cppcanvas
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetDestPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetDestSize() ),
rCanvas,
rStates.getState() ) );
@@ -2456,9 +2456,9 @@ namespace cppcanvas
std::move(pGradient),
rParms,
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+ vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
rStates.getState().mapModeTransform *
- ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+ vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
rCanvas,
rStates.getState() ) );
@@ -2532,8 +2532,8 @@ namespace cppcanvas
tools::createTextLinesPolyPolygon(
rState.mapModeTransform *
::basegfx::B2DPoint(
- ::vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
- ::vcl::unotools::b2DSizeFromSize(aBaselineOffset)),
+ vcl::unotools::b2DPointFromPoint(pAct->GetStartPoint()) +
+ vcl::unotools::b2DSizeFromSize(aBaselineOffset)),
aSize.getX(),
tools::createTextLineInfo( rVDev,
rState )),
@@ -2985,7 +2985,7 @@ namespace cppcanvas
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
rState.xFont = createFont( rState.fontRotation,
- ::vcl::Font(), // default font
+ vcl::Font(), // default font
aParms );
}
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 0467359ded8b..228dd73ad52c 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -91,7 +91,7 @@ namespace cppcanvas
maState()
{
tools::initRenderState(maState,rState);
- maState.DeviceColor = ::vcl::unotools::colorToDoubleSequence(
+ maState.DeviceColor = vcl::unotools::colorToDoubleSequence(
rAltColor,
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
}
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index fd4660709aee..ec0b131b594d 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -514,7 +514,7 @@ namespace cppcanvas
::canvas::tools::appendToRenderState(aShadowState, aTranslate);
aShadowState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence( rShadowColor,
+ vcl::unotools::colorToDoubleSequence( rShadowColor,
xColorSpace );
rRenderer( aShadowState );
@@ -532,7 +532,7 @@ namespace cppcanvas
::canvas::tools::appendToRenderState(aReliefState, aTranslate);
aReliefState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence( rReliefColor,
+ vcl::unotools::colorToDoubleSequence( rReliefColor,
xColorSpace );
rRenderer( aReliefState );
@@ -1633,7 +1633,7 @@ namespace cppcanvas
maState(),
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
@@ -1677,7 +1677,7 @@ namespace cppcanvas
maState(),
mnOutlineWidth( calcOutlineWidth(rState,rVDev) ),
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() )),
maTextLineInfo( tools::createTextLineInfo( rVDev, rState ) ),
@@ -1772,7 +1772,7 @@ namespace cppcanvas
const rendering::ViewState& rViewState,
double nOutlineWidth ) :
maFillColor(
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( COL_WHITE ),
rCanvas->getDevice()->getDeviceColorSpace() )),
mnOutlineWidth( nOutlineWidth ),
@@ -2106,9 +2106,9 @@ namespace cppcanvas
rStartPoint.Y() + aBaselineOffset.Height()) );
const ::basegfx::B2DSize aReliefOffset(
- rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rReliefOffset ) );
+ rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rReliefOffset ) );
const ::basegfx::B2DSize aShadowOffset(
- rState.mapModeTransform * ::vcl::unotools::b2DSizeFromSize( rShadowOffset ) );
+ rState.mapModeTransform * vcl::unotools::b2DSizeFromSize( rShadowOffset ) );
if( rState.isTextOutlineModeSet )
{
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index a943e36a198c..412280bf4eba 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -386,7 +386,7 @@ namespace cppcanvas
#if OSL_DEBUG_LEVEL > 2
aLocalState.Clip.clear();
aLocalState.DeviceColor =
- ::vcl::unotools::colorToDoubleSequence(
+ vcl::unotools::colorToDoubleSequence(
::Color( 0x80FF0000 ),
mpCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace() );
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 669aabfc16e3..338daa4ba731 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -81,7 +81,7 @@ namespace cppcanvas
return BitmapSharedPtr();
return BitmapSharedPtr( new internal::ImplBitmap( rCanvas,
- ::vcl::unotools::xBitmapFromBitmapEx(
+ vcl::unotools::xBitmapFromBitmapEx(
xCanvas->getDevice(),
rBmpEx) ) );
}