diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-29 15:48:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-30 08:10:22 +0200 |
| commit | 065c8b48a604b70140862d0d02deb584626d6994 (patch) | |
| tree | 578c07b470b8ec9e5908d224c2fbf33cadda5adf /canvas | |
| parent | addb63fa8ac9fa1a29a00e886e7ae177b604494c (diff) | |
use uno::Reference::set method instead of assignment
Change-Id: I58410209f32f988f258a588364e0b037c2790211
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 8 | ||||
| -rw-r--r-- | canvas/source/tools/canvastools.cxx | 4 | ||||
| -rw-r--r-- | canvas/workben/canvasdemo.cxx | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index bef07e2ebf99..030f7e0f4ea8 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1336,7 +1336,7 @@ namespace cairocanvas bool bHasAlpha ) { SurfaceSharedPtr pSurface=pInputSurface; - uno::Reference< rendering::XCachedPrimitive > rv = uno::Reference< rendering::XCachedPrimitive >(NULL); + uno::Reference< rendering::XCachedPrimitive > rv(NULL); geometry::IntegerSize2D aBitmapSize = rSize; if( mpCairo ) @@ -1381,7 +1381,7 @@ namespace cairocanvas aMatrix.xx = aMatrix.yy = 1; cairo_set_matrix( mpCairo.get(), &aMatrix ); - rv = uno::Reference< rendering::XCachedPrimitive >( + rv.set( new CachedBitmap( pSurface, viewState, renderState, // cast away const, need to // change refcount (as this is @@ -1467,7 +1467,7 @@ namespace cairocanvas free( data ); } else - rv = uno::Reference< rendering::XCachedPrimitive >(NULL); + rv.set(NULL); #ifdef CAIRO_CANVAS_PERF_TRACE mxDevice->stopPerfTrace( &aTimer, "drawBitmap" ); @@ -1500,7 +1500,7 @@ namespace cairocanvas free( data ); } else - rv = uno::Reference< rendering::XCachedPrimitive >(NULL); + rv.set(NULL); #ifdef CAIRO_CANVAS_PERF_TRACE mxDevice->stopPerfTrace( &aTimer, "drawBitmap" ); diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index f54ecce423af..d01adf36aa4f 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -77,7 +77,7 @@ namespace canvas { // setup identity transform setIdentityAffineMatrix2D( renderState.AffineTransform ); - renderState.Clip = uno::Reference< rendering::XPolyPolygon2D >(); + renderState.Clip.clear(); renderState.DeviceColor = uno::Sequence< double >(); renderState.CompositeOperation = rendering::CompositeOperation::OVER; @@ -88,7 +88,7 @@ namespace canvas { // setup identity transform setIdentityAffineMatrix2D( viewState.AffineTransform ); - viewState.Clip = uno::Reference< rendering::XPolyPolygon2D >(); + viewState.Clip.clear(); return viewState; } diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 7f93115a175d..50211ff65776 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -657,8 +657,7 @@ void DemoApp::Main() try { uno::Reference< uno::XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext(); - xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(), - uno::UNO_QUERY ); + xFactory.set( xCtx->getServiceManager(), uno::UNO_QUERY ); if( xFactory.is() ) ::comphelper::setProcessServiceFactory( xFactory ); } |