diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:11:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:18 +0100 |
commit | c40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3 (patch) | |
tree | 8747fa725af32579c947951d4e739520b655842c /canvas/source/cairo | |
parent | loplugin:nullptr (automatic rewrite) (diff) | |
download | core-c40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3.tar.gz core-c40c7a8c364bd8f1d7777e803e5a6b0cfddeaca3.zip |
loplugin:nullptr (automatic rewrite)
Change-Id: I9e064592c4ee18a600aadfa20b3c89ecafc818d4
Diffstat (limited to 'canvas/source/cairo')
-rw-r--r-- | canvas/source/cairo/cairo_canvas.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 44 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.hxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 10 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 8 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritecanvas.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritecanvashelper.cxx | 8 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritedevicehelper.cxx | 4 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritehelper.cxx | 2 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 6 |
10 files changed, 45 insertions, 45 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 589d585121ba..dd65071cfeea 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -79,7 +79,7 @@ namespace cairocanvas maArguments[0] >>= nPtr; OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr); - ENSURE_ARG_OR_THROW( pOutDev != NULL, + ENSURE_ARG_OR_THROW( pOutDev != nullptr, "Canvas::initialize: invalid OutDev pointer" ); awt::Rectangle aBounds; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 030f7e0f4ea8..af94c38d2259 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -66,8 +66,8 @@ using namespace ::com::sun::star; namespace cairocanvas { CanvasHelper::CanvasHelper() : - mpSurfaceProvider(NULL), - mpDevice(NULL), + mpSurfaceProvider(nullptr), + mpDevice(nullptr), mpVirtualDevice(), mbHaveAlpha(), mpCairo(), @@ -81,8 +81,8 @@ namespace cairocanvas mpSurface.reset(); mpCairo.reset(); mpVirtualDevice.disposeAndClear(); - mpDevice = NULL; - mpSurfaceProvider = NULL; + mpDevice = nullptr; + mpSurfaceProvider = nullptr; } void CanvasHelper::init( const ::basegfx::B2ISize& rSizePixel, @@ -408,7 +408,7 @@ namespace cairocanvas bHasAlpha = xBitmap->hasAlpha(); SurfaceSharedPtr pSurface = surfaceFromXBitmap( xBitmap ); if( pSurface ) - data = NULL; + data = nullptr; else { ::BitmapEx aBmpEx = bitmapExFromXBitmap(xBitmap); @@ -420,7 +420,7 @@ namespace cairocanvas if( !aBmpEx.IsTransparent() && !aBmpEx.IsAlpha() ) { pSurface = rSurfaceProvider->createSurface( aBitmap ); - data = NULL; + data = nullptr; bHasAlpha = false; } @@ -429,7 +429,7 @@ namespace cairocanvas AlphaMask aAlpha = aBmpEx.GetAlpha(); ::BitmapReadAccess* pBitmapReadAcc = aBitmap.AcquireReadAccess(); - ::BitmapReadAccess* pAlphaReadAcc = NULL; + ::BitmapReadAccess* pAlphaReadAcc = nullptr; const long nWidth = pBitmapReadAcc->Width(); const long nHeight = pBitmapReadAcc->Height(); long nX, nY; @@ -704,7 +704,7 @@ namespace cairocanvas static cairo_pattern_t* patternFromParametricPolyPolygon( ::canvas::ParametricPolyPolygon& rPolygon ) { - cairo_pattern_t* pPattern = NULL; + cairo_pattern_t* pPattern = nullptr; const ::canvas::ParametricPolyPolygon::Values aValues = rPolygon.getValues(); double x0, x1, y0, y1, cx, cy, r0, r1; @@ -750,7 +750,7 @@ namespace cairocanvas const css::rendering::Texture& aTexture ( (*pTextures)[0] ); if( aTexture.Bitmap.is() ) { - unsigned char* data = NULL; + unsigned char* data = nullptr; bool bHasAlpha = false; SurfaceSharedPtr pSurface = surfaceFromXBitmap( (*pTextures)[0].Bitmap, pDevice, data, bHasAlpha ); @@ -1149,7 +1149,7 @@ namespace cairocanvas mxDevice->stopPerfTrace( &aTimer, "drawPolyPolygon" ); #endif - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokePolyPolygon( const rendering::XCanvas* , @@ -1232,7 +1232,7 @@ namespace cairocanvas #endif // TODO(P1): Provide caching here. - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTexturedPolyPolygon( const rendering::XCanvas* , @@ -1243,7 +1243,7 @@ namespace cairocanvas const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::strokeTextureMappedPolyPolygon( const rendering::XCanvas* , @@ -1255,7 +1255,7 @@ namespace cairocanvas const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XPolyPolygon2D > CanvasHelper::queryStrokeShapes( const rendering::XCanvas* , @@ -1265,7 +1265,7 @@ namespace cairocanvas const rendering::StrokeAttributes& /*strokeAttributes*/ ) { // TODO - return uno::Reference< rendering::XPolyPolygon2D >(NULL); + return uno::Reference< rendering::XPolyPolygon2D >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillPolyPolygon( const rendering::XCanvas* , @@ -1294,7 +1294,7 @@ namespace cairocanvas mxDevice->stopPerfTrace( &aTimer, "fillPolyPolygon" ); #endif - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* , @@ -1313,7 +1313,7 @@ namespace cairocanvas cairo_restore( mpCairo.get() ); } - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTextureMappedPolyPolygon( const rendering::XCanvas* , @@ -1324,7 +1324,7 @@ namespace cairocanvas const uno::Reference< geometry::XMapping2D >& /*xMapping*/ ) { // TODO - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::implDrawBitmapSurface( const rendering::XCanvas* pCanvas, @@ -1336,7 +1336,7 @@ namespace cairocanvas bool bHasAlpha ) { SurfaceSharedPtr pSurface=pInputSurface; - uno::Reference< rendering::XCachedPrimitive > rv(NULL); + uno::Reference< rendering::XCachedPrimitive > rv(nullptr); geometry::IntegerSize2D aBitmapSize = rSize; if( mpCairo ) @@ -1454,7 +1454,7 @@ namespace cairocanvas #endif uno::Reference< rendering::XCachedPrimitive > rv; - unsigned char* data = NULL; + unsigned char* data = nullptr; bool bHasAlpha = false; SurfaceSharedPtr pSurface = surfaceFromXBitmap( xBitmap, mpSurfaceProvider, data, bHasAlpha ); geometry::IntegerSize2D aSize = xBitmap->getSize(); @@ -1467,7 +1467,7 @@ namespace cairocanvas free( data ); } else - rv.set(NULL); + rv.set(nullptr); #ifdef CAIRO_CANVAS_PERF_TRACE mxDevice->stopPerfTrace( &aTimer, "drawBitmap" ); @@ -1487,7 +1487,7 @@ namespace cairocanvas #endif uno::Reference< rendering::XCachedPrimitive > rv; - unsigned char* data = NULL; + unsigned char* data = nullptr; bool bHasAlpha = false; SurfaceSharedPtr pSurface = surfaceFromXBitmap( xBitmap, mpSurfaceProvider, data, bHasAlpha ); geometry::IntegerSize2D aSize = xBitmap->getSize(); @@ -1500,7 +1500,7 @@ namespace cairocanvas free( data ); } else - rv.set(NULL); + rv.set(nullptr); #ifdef CAIRO_CANVAS_PERF_TRACE mxDevice->stopPerfTrace( &aTimer, "drawBitmap" ); diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 84e0d68cb21a..f03f9d3f3a7c 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -218,8 +218,8 @@ namespace cairocanvas void doPolyPolygonPath( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, Operation aOperation, bool bNoLineJoin = false, - const css::uno::Sequence< css::rendering::Texture >* pTextures=NULL, - cairo_t* pCairo=NULL ) const; + const css::uno::Sequence< css::rendering::Texture >* pTextures=nullptr, + cairo_t* pCairo=nullptr ) const; css::uno::Reference< css::rendering::XCachedPrimitive > implDrawBitmapSurface( const css::rendering::XCanvas* pCanvas, diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index cec836cc77e6..6f37f7f310b2 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -240,7 +240,7 @@ namespace cairocanvas if (!aRegion.IsEmpty() && !aRegion.IsNull()) { doPolyPolygonImplementation(aRegion.GetAsB2DPolyPolygon(), Clip, mpCairo.get(), - NULL, mpSurfaceProvider, rendering::FillRule_EVEN_ODD); + nullptr, mpSurfaceProvider, rendering::FillRule_EVEN_ODD); } } @@ -273,7 +273,7 @@ namespace cairocanvas #endif ::Point aOutpos; if( !setupTextOutput( *mpVirtualDevice.get(), pOwner, aOutpos, viewState, renderState, xFont ) ) - return uno::Reference< rendering::XCachedPrimitive >(NULL); // no output necessary + return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary // change text direction and layout mode ComplexTextLayoutMode nLayoutMode(TEXT_LAYOUT_DEFAULT); @@ -307,7 +307,7 @@ namespace cairocanvas pTextLayout->draw(mpCairo, *mpVirtualDevice, aOutpos, viewState, renderState); } - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawTextLayout( const rendering::XCanvas* pOwner, @@ -341,7 +341,7 @@ namespace cairocanvas ::Point aOutpos; if( !setupTextOutput( *mpVirtualDevice, pOwner, aOutpos, viewState, renderState, xLayoutedText->getFont() ) ) - return uno::Reference< rendering::XCachedPrimitive >(NULL); // no output necessary + return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary clip_cairo_from_dev(*mpVirtualDevice); @@ -355,7 +355,7 @@ namespace cairocanvas "CanvasHelper::drawTextLayout(): TextLayout not compatible with this canvas" ); } - return uno::Reference< rendering::XCachedPrimitive >(NULL); + return uno::Reference< rendering::XCachedPrimitive >(nullptr); } } diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index a0ebb42abf98..2f214ad15e1f 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -40,8 +40,8 @@ using namespace ::com::sun::star; namespace cairocanvas { DeviceHelper::DeviceHelper() : - mpSurfaceProvider( NULL ), - mpRefDevice( NULL ), + mpSurfaceProvider( nullptr ), + mpRefDevice( nullptr ), mpSurface() { } @@ -71,8 +71,8 @@ namespace cairocanvas { // release all references mpSurface.reset(); - mpRefDevice = NULL; - mpSurfaceProvider = NULL; + mpRefDevice = nullptr; + mpSurfaceProvider = nullptr; } void DeviceHelper::setSize( const ::basegfx::B2ISize& rSize ) diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index dae8e0a5749d..9c6dd667029a 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -80,7 +80,7 @@ namespace cairocanvas vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( - "Parent window not VCL window, or canvas out-of-process!", NULL); + "Parent window not VCL window, or canvas out-of-process!", nullptr); bool bHasCairo = pParentWindow->SupportsCairo(); ENSURE_ARG_OR_THROW(bHasCairo, diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index a1b16436739c..03fa5597e319 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -89,8 +89,8 @@ namespace cairocanvas } SpriteCanvasHelper::SpriteCanvasHelper() : - mpRedrawManager( NULL ), - mpOwningSpriteCanvas( NULL ), + mpRedrawManager( nullptr ), + mpOwningSpriteCanvas( nullptr ), mpCompositingSurface(), maCompositingSurfaceSize(), mbCompositingSurfaceDirty(true) @@ -110,8 +110,8 @@ namespace cairocanvas void SpriteCanvasHelper::disposing() { mpCompositingSurface.reset(); - mpOwningSpriteCanvas = NULL; - mpRedrawManager = NULL; + mpOwningSpriteCanvas = nullptr; + mpRedrawManager = nullptr; // forward to base CanvasHelper::disposing(); diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index 467b4a8738ec..b2a263f5c447 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -41,7 +41,7 @@ namespace cairocanvas { SpriteDeviceHelper::SpriteDeviceHelper() : - mpSpriteCanvas( NULL ), + mpSpriteCanvas( nullptr ), mpBufferSurface(), maSize(), mbFullScreen( false ) @@ -65,7 +65,7 @@ namespace cairocanvas { // release all references mpBufferSurface.reset(); - mpSpriteCanvas = NULL; + mpSpriteCanvas = nullptr; } bool SpriteDeviceHelper::showBuffer( bool, bool ) diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx index 0a78151299af..c6c03a90da88 100644 --- a/canvas/source/cairo/cairo_spritehelper.cxx +++ b/canvas/source/cairo/cairo_spritehelper.cxx @@ -133,7 +133,7 @@ namespace cairocanvas rClip )); doPolyPolygonImplementation( aClipPoly, Clip, pCairo.get(), - NULL, SurfaceProviderRef(mpSpriteCanvas.get()), + nullptr, SurfaceProviderRef(mpSpriteCanvas.get()), rClip->getFillRule() ); } diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 3bfd1dd29b8d..2f4af89fb2c9 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -341,7 +341,7 @@ namespace cairocanvas aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text, ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length), - maLogicalAdvancements.getLength() ? aOffsets.get() : NULL); + maLogicalAdvancements.getLength() ? aOffsets.get() : nullptr); // Sort them so that all glyphs on the same glyph fallback level are consecutive std::sort(aSysLayoutData.rGlyphData.begin(), aSysLayoutData.rGlyphData.end(), compareFallbacks); @@ -432,7 +432,7 @@ namespace cairocanvas /** * Setup font **/ - cairo_font_face_t* font_face = NULL; + cairo_font_face_t* font_face = nullptr; #if defined CAIRO_HAS_FT_FONT font_face = cairo_ft_font_face_create_for_ft_face(static_cast<FT_Face>(rSysFontData.nFontId), @@ -563,7 +563,7 @@ namespace cairocanvas const rendering::ViewState& viewState, const rendering::RenderState& renderState ) const { - ENSURE_OR_THROW( outputOffsets!=NULL, + ENSURE_OR_THROW( outputOffsets!=nullptr, "TextLayout::setupTextOffsets offsets NULL" ); ::basegfx::B2DHomMatrix aMatrix; |