Kaydet (Commit) 7727b9e8 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

oglcanvas: OUString cleanup

Change-Id: If37ea29ba239c0affd8e5777c82db755ee03f1c2
üst 8996ab35
...@@ -70,9 +70,7 @@ namespace oglcanvas ...@@ -70,9 +70,7 @@ namespace oglcanvas
Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow ) if( !pParentWindow )
throw lang::NoSupportException( 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; awt::Rectangle aRect;
maArguments[2] >>= aRect; maArguments[2] >>= aRect;
...@@ -154,7 +152,7 @@ namespace oglcanvas ...@@ -154,7 +152,7 @@ namespace oglcanvas
::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) ::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 ) void SpriteCanvas::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )
......
...@@ -608,9 +608,7 @@ namespace oglcanvas ...@@ -608,9 +608,7 @@ namespace oglcanvas
{ {
glXDestroyContext(pDisplay, pContext1); glXDestroyContext(pDisplay, pContext1);
glXDestroyContext(pDisplay, pContext2); glXDestroyContext(pDisplay, pContext2);
throw lang::NoSupportException( throw lang::NoSupportException("Could not select OpenGL context!", NULL);
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not select OpenGL context!") ),NULL);
} }
const GLubyte* extensions=glGetString( GL_EXTENSIONS ); const GLubyte* extensions=glGetString( GL_EXTENSIONS );
...@@ -696,8 +694,7 @@ namespace oglcanvas ...@@ -696,8 +694,7 @@ namespace oglcanvas
if( !mpGLContext || glGetError() != GL_NO_ERROR ) if( !mpGLContext || glGetError() != GL_NO_ERROR )
throw lang::NoSupportException( 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); notifySizeUpdate(rViewArea);
mpChildWindow->Show(); mpChildWindow->Show();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment