summaryrefslogtreecommitdiff
path: root/canvas/source/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/vcl')
-rw-r--r--canvas/source/vcl/canvas.cxx7
-rw-r--r--canvas/source/vcl/canvasbitmap.cxx2
-rw-r--r--canvas/source/vcl/canvascustomsprite.cxx3
-rw-r--r--canvas/source/vcl/canvasfont.cxx2
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx7
-rw-r--r--canvas/source/vcl/spritehelper.cxx2
-rw-r--r--canvas/source/vcl/textlayout.cxx3
7 files changed, 11 insertions, 15 deletions
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 4b59cef867e7..5a44e4016307 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -40,7 +40,6 @@
#include "canvas.hxx"
#include "windowoutdevholder.hxx"
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -101,7 +100,7 @@ namespace vclcanvas
OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
if( !pOutDev )
throw lang::NoSupportException(
- ::rtl::OUString( "Passed OutDev invalid!" ),
+ OUString( "Passed OutDev invalid!" ),
NULL);
OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) );
@@ -131,9 +130,9 @@ namespace vclcanvas
CanvasBaseT::disposeThis();
}
- ::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException)
+ OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString( CANVAS_SERVICE_NAME );
+ return OUString( CANVAS_SERVICE_NAME );
}
bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index b941eb18f806..a469e448ed41 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -79,7 +79,7 @@ namespace vclcanvas
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+ sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index a45221278c42..9dead83713de 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -42,7 +42,6 @@
#include "canvascustomsprite.hxx"
-
using namespace ::com::sun::star;
@@ -126,7 +125,7 @@ namespace vclcanvas
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 8f422f73b358..c314e5d3298c 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -158,7 +158,7 @@ namespace vclcanvas
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL CanvasFont::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index dc663954d254..d9a77f22212e 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -36,7 +36,6 @@
#include "spritecanvashelper.hxx"
#include "canvascustomsprite.hxx"
-
using namespace ::com::sun::star;
#define FPS_BOUNDS Rectangle(0,0,130,90)
@@ -158,7 +157,7 @@ namespace vclcanvas
}
void renderInfoText( OutputDevice& rOutDev,
- const ::rtl::OUString& rStr,
+ const OUString& rStr,
const Point& rPos )
{
Font aVCLFont;
@@ -641,8 +640,8 @@ namespace vclcanvas
sal_Int32 nCount(0);
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
- ::rtl::OUString text(
- ::rtl::OUString::valueOf(
+ OUString text(
+ OUString::valueOf(
// disambiguate overload...
static_cast<sal_Int64>(nCount) ) );
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 534e0cb9e9f6..541115884f29 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -396,7 +396,7 @@ namespace vclcanvas
rTargetSurface.SetTextColor( COL_RED );
rTargetSurface.SetFont( aVCLFont );
- ::rtl::OUString text( ::rtl::math::doubleToUString( getPriority(),
+ OUString text( ::rtl::math::doubleToUString( getPriority(),
rtl_math_StringFormat_F,
2,'.',NULL,' ') );
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 72ede12ae85b..d8a0b14fbed5 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -37,7 +37,6 @@
#include <boost/scoped_array.hpp>
-
using namespace ::com::sun::star;
namespace vclcanvas
@@ -471,7 +470,7 @@ namespace vclcanvas
return OUString( IMPLEMENTATION_NAME );
}
- sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+ sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
{
return ServiceName == SERVICE_NAME;
}