diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvascustomsprite.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_spritehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_textlayout.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/canvascustomspritehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 0464a06d2b89..b885071787d5 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -42,7 +42,7 @@ namespace cairocanvas maSize( ::canvas::tools::roundUp( rSpriteSize.Width ), ::canvas::tools::roundUp( rSpriteSize.Height ) ) { - ENSURE_OR_THROW( rRefDevice.get(), + ENSURE_OR_THROW( rRefDevice, "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" ); SAL_INFO( "canvas.cairo", "sprite size: " << ::canvas::tools::roundUp( rSpriteSize.Width ) << ", " << ::canvas::tools::roundUp( rSpriteSize.Height )); diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index aafab160c51d..667f1ba249ba 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -45,7 +45,7 @@ namespace cairocanvas void SpriteHelper::init( const geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rSpriteCanvas ) { - ENSURE_OR_THROW( rSpriteCanvas.get(), + ENSURE_OR_THROW( rSpriteCanvas, "SpriteHelper::init(): Invalid device, sprite canvas or surface" ); mpSpriteCanvas = rSpriteCanvas; diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index c7ca59b28291..903a0edfc93b 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -38,7 +38,7 @@ namespace oglcanvas mfAlpha(0.0), mfPriority(0.0) { - ENSURE_OR_THROW( rRefDevice.get(), + ENSURE_OR_THROW( rRefDevice, "CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" ); ::canvas::tools::setIdentityAffineMatrix2D(maTransformation); diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index aa5a35296a97..89e7a16a681f 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -78,7 +78,7 @@ namespace oglcanvas { ::osl::MutexGuard aGuard( m_aMutex ); - ENSURE_OR_THROW( mpFont.get(), + ENSURE_OR_THROW( mpFont, "TextLayout::queryTextBounds(): invalid font" ); // fake text bounds by either taking the advancement values, diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx index ef02a9d5a418..156936a05e53 100644 --- a/canvas/source/tools/canvascustomspritehelper.cxx +++ b/canvas/source/tools/canvascustomspritehelper.cxx @@ -164,7 +164,7 @@ namespace canvas void CanvasCustomSpriteHelper::init( const geometry::RealSize2D& rSpriteSize, const SpriteSurface::Reference& rOwningSpriteCanvas ) { - ENSURE_OR_THROW( rOwningSpriteCanvas.get(), + ENSURE_OR_THROW( rOwningSpriteCanvas, "CanvasCustomSpriteHelper::init(): Invalid owning sprite canvas" ); mpSpriteCanvas = rOwningSpriteCanvas; diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 07dc45574e64..981a442a2e6c 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -994,7 +994,7 @@ namespace vclcanvas const rendering::RenderState& renderState, ColorType eColorType ) const { - ENSURE_OR_THROW( mpOutDevProvider.get(), + ENSURE_OR_THROW( mpOutDevProvider, "outdev null. Are we disposed?" ); ::canvas::tools::verifyInput( renderState, @@ -1079,7 +1079,7 @@ namespace vclcanvas const rendering::RenderState& renderState, const uno::Reference< rendering::XCanvasFont >& xFont ) const { - ENSURE_OR_THROW( mpOutDevProvider.get(), + ENSURE_OR_THROW( mpOutDevProvider, "outdev null. Are we disposed?" ); OutputDevice& rOutDev( mpOutDevProvider->getOutDev() ); |