summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-28 10:25:22 +0200
committerNoel Grandin <noel@peralex.com>2014-05-29 09:01:40 +0200
commitf0ae48b684e89acd7088c31a8feff5fc03d51105 (patch)
treec2560690a0d7ba016ff832cd1561da5d4532c6d9 /canvas
parent7e4c6e1ff1961ad7a48cc9c1d9b3668372c6aed8 (diff)
remove unnecessary NULL parameter passed to UNO Exception
.. now that we have a default value for that parameter Change-Id: I54d6b0a0a01ce2f2e5168ada0c427424de0477bc
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvas.cxx2
-rw-r--r--canvas/source/directx/dx_9rm.cxx10
-rw-r--r--canvas/source/directx/dx_canvas.cxx6
-rw-r--r--canvas/source/directx/dx_spritecanvas.cxx2
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx2
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.cxx4
6 files changed, 13 insertions, 13 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 1acc283b5aca..74da4c94efca 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -90,7 +90,7 @@ namespace cairocanvas
const SystemGraphicsData* pSysData=reinterpret_cast<const SystemGraphicsData*>(aSeq.getConstArray());
if( !pSysData || !pSysData->nSize )
- throw lang::NoSupportException( "Passed SystemGraphicsData invalid!", NULL);
+ throw lang::NoSupportException( "Passed SystemGraphicsData invalid!" );
bool bHasXRender = IsCairoWorking(pOutDev);
ENSURE_ARG_OR_THROW( bHasXRender == true, "SpriteCanvas::SpriteCanvas: No RENDER extension" );
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index aab66832f757..e34233849fcc 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -588,7 +588,7 @@ namespace dxcanvas
if(!(create(rWindow)))
{
- throw lang::NoSupportException( "Could not create DirectX device!" ,NULL);
+ throw lang::NoSupportException( "Could not create DirectX device!" );
}
// allocate a single texture surface which can be used later.
@@ -607,7 +607,7 @@ namespace dxcanvas
(aPageSize.getY() < MIN_TEXTURE_SIZE))
{
throw lang::NoSupportException(
- "Could not create DirectX device - insufficient texture space!", NULL );
+ "Could not create DirectX device - insufficient texture space!" );
}
}
maPageSize=aPageSize;
@@ -622,7 +622,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
- "Could not create DirectX device - out of memory!", NULL );
+ "Could not create DirectX device - out of memory!" );
}
mpVertexBuffer=COMReference<IDirect3DVertexBuffer9>(pVB);
@@ -903,7 +903,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
- "Could not create offscreen surface - out of mem!", NULL );
+ "Could not create offscreen surface - out of mem!" );
}
return COMReference<IDirect3DSurface9>(pSurface);
@@ -957,7 +957,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
- "Could not create DirectX device - out of memory!", NULL );
+ "Could not create DirectX device - out of memory!" );
}
mpVertexBuffer=COMReference<IDirect3DVertexBuffer9>(pVB);
diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index 2c471eefe593..0cfb5420d0cb 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -96,7 +96,7 @@ namespace dxcanvas
const SystemGraphicsData* pSysData=reinterpret_cast<const SystemGraphicsData*>(aSeq.getConstArray());
if( !pSysData || !pSysData->hDC )
- throw lang::NoSupportException("Passed SystemGraphicsData or HDC invalid!", NULL);
+ throw lang::NoSupportException("Passed SystemGraphicsData or HDC invalid!");
sal_Int64 nPtr = 0;
maArguments[0] >>= nPtr;
@@ -157,7 +157,7 @@ namespace dxcanvas
const SystemGraphicsData* pSysData=reinterpret_cast<const SystemGraphicsData*>(aSeq.getConstArray());
if( !pSysData || !pSysData->hDC )
- throw lang::NoSupportException( "Passed SystemGraphicsData or HDC invalid!", NULL);
+ throw lang::NoSupportException( "Passed SystemGraphicsData or HDC invalid!");
sal_Int64 nPtr = 0;
maArguments[0] >>= nPtr;
@@ -175,7 +175,7 @@ namespace dxcanvas
hBmp=(HBITMAP)GetCurrentObject(pSysData->hDC, OBJ_BITMAP);
if( !hBmp || GetObjectType(pSysData->hDC) != OBJ_MEMDC )
{
- throw lang::NoSupportException( "Passed HDC is no mem DC/has no bitmap selected!", NULL);
+ throw lang::NoSupportException( "Passed HDC is no mem DC/has no bitmap selected!");
}
mpTarget.reset( new DXBitmap(
diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index d4d9072f9cf9..3d36b2033962 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -90,7 +90,7 @@ namespace dxcanvas
maArguments[4] >>= xParentWindow;
Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
if( !pParentWindow )
- throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", NULL);
+ throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!" );
awt::Rectangle aRect;
maArguments[2] >>= aRect;
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index cd407b6aece6..76cf78efceb0 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -68,7 +68,7 @@ namespace dxcanvas
const SystemEnvData *pData = rWindow.GetSystemData();
const HWND hWnd = reinterpret_cast<HWND>(pData->hWnd);
if( !IsWindow( hWnd ) )
- throw lang::NoSupportException( "Passed window has invalid system window, or canvas out-of-process!", NULL);
+ throw lang::NoSupportException( "Passed window has invalid system window, or canvas out-of-process!" );
mpSpriteCanvas = &rSpriteCanvas;
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 52491c678737..d0dd6bb04931 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -608,7 +608,7 @@ namespace oglcanvas
{
glXDestroyContext(pDisplay, pContext1);
glXDestroyContext(pDisplay, pContext2);
- throw lang::NoSupportException("Could not select OpenGL context!", NULL);
+ throw lang::NoSupportException("Could not select OpenGL context!");
}
const GLubyte* extensions=glGetString( GL_EXTENSIONS );
@@ -694,7 +694,7 @@ namespace oglcanvas
if( !mpGLContext || glGetError() != GL_NO_ERROR )
throw lang::NoSupportException(
- "Could not create OpenGL context, or an error occurred doing so!", NULL);
+ "Could not create OpenGL context, or an error occurred doing so!");
notifySizeUpdate(rViewArea);
mpChildWindow->Show();