summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorThorsten Behrens <thb@documentfoundation.org>2013-10-08 15:56:59 +0200
committerThorsten Behrens <thb@documentfoundation.org>2013-10-09 20:09:12 +0200
commit7727b9e88d0498dfb800354debaf889c8cf63bd7 (patch)
treec0d0ac65bc41c3880336e48ffd56999c7d6d1ebe /canvas
parent8996ab35db7ae98e63b7735e8f172da3d9e48af0 (diff)
oglcanvas: OUString cleanup
Change-Id: If37ea29ba239c0affd8e5777c82db755ee03f1c2
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx6
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx7
2 files changed, 4 insertions, 9 deletions
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index a3d114bbbabb..ad02eb1d8faa 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -70,9 +70,7 @@ namespace oglcanvas
Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Parent window not VCL window, or canvas out-of-process!")),
- NULL);
+ "Parent window not VCL window, or canvas out-of-process!", NULL);
awt::Rectangle aRect;
maArguments[2] >>= aRect;
@@ -154,7 +152,7 @@ namespace oglcanvas
::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SPRITECANVAS_SERVICE_NAME ) );
+ return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME );
}
void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 4f03bb7d84ad..d27a6a25871f 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -608,9 +608,7 @@ namespace oglcanvas
{
glXDestroyContext(pDisplay, pContext1);
glXDestroyContext(pDisplay, pContext2);
- throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Could not select OpenGL context!") ),NULL);
+ throw lang::NoSupportException("Could not select OpenGL context!", NULL);
}
const GLubyte* extensions=glGetString( GL_EXTENSIONS );
@@ -696,8 +694,7 @@ namespace oglcanvas
if( !mpGLContext || glGetError() != GL_NO_ERROR )
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Could not create OpenGL context, or an error occurred doing so!") ),NULL);
+ "Could not create OpenGL context, or an error occurred doing so!", NULL);
notifySizeUpdate(rViewArea);
mpChildWindow->Show();