summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-01-07 13:52:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-08 10:38:35 +0100
commit17dd2662ccfa9d04efbea74e5d7548db5b2126d4 (patch)
tree37c0de883c43a57f54b0a483437da9de3bf4c941 /canvas
parent638be04c8334e5e29f9258ff870fbe63603ce7e0 (diff)
convert "*xxx.get()" to "*xxx"
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9 Reviewed-on: https://gerrit.libreoffice.org/65951 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx2
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx2
-rw-r--r--canvas/source/directx/dx_canvasbitmap.cxx2
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.cxx2
-rw-r--r--canvas/source/opengl/ogl_canvasbitmap.cxx2
-rw-r--r--canvas/source/opengl/ogl_canvascustomsprite.cxx2
-rw-r--r--canvas/source/vcl/backbuffer.cxx4
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx2
-rw-r--r--canvas/source/vcl/devicehelper.cxx4
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx4
-rw-r--r--canvas/source/vcl/textlayout.cxx6
11 files changed, 16 insertions, 16 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index d0704e877677..85f68d8915be 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -240,7 +240,7 @@ namespace cairocanvas
cairo_fill(mpCairo.get());
#endif
::Point aOutpos;
- if( !setupTextOutput( *mpVirtualDevice.get(), pOwner, aOutpos, viewState, renderState, xFont ) )
+ if( !setupTextOutput( *mpVirtualDevice, pOwner, aOutpos, viewState, renderState, xFont ) )
return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary
// change text direction and layout mode
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 087f0479bf05..f24405f73cfe 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -161,7 +161,7 @@ namespace cairocanvas
// relative to baseline
const ::FontMetric& aMetric( pVDev->GetFontMetric() );
- setupLayoutMode( *pVDev.get(), mnTextDirection );
+ setupLayoutMode( *pVDev, mnTextDirection );
const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 49c4160dbe22..e7a89ae888e4 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -43,7 +43,7 @@ namespace dxcanvas
ENSURE_OR_THROW( mpDevice.is() && mpBitmap,
"CanvasBitmap::CanvasBitmap(): Invalid surface or device" );
- maCanvasHelper.setDevice( *mpDevice.get() );
+ maCanvasHelper.setDevice( *mpDevice );
maCanvasHelper.setTarget( mpBitmap );
}
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index b1b0d58e102d..018723d6b692 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -55,7 +55,7 @@ namespace dxcanvas
rRenderModule,
true));
- maCanvasHelper.setDevice( *rRefDevice.get() );
+ maCanvasHelper.setDevice( *rRefDevice );
maCanvasHelper.setTarget( mpSurface );
maSpriteHelper.init( rSpriteSize,
diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx
index 69d049f0c391..63f10d313288 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.cxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.cxx
@@ -28,7 +28,7 @@ namespace oglcanvas
ENSURE_OR_THROW( mpDevice.is(),
"CanvasBitmap::CanvasBitmap(): Invalid surface or device" );
- maCanvasHelper.init( *mpDevice.get(), rDeviceHelper, rSize );
+ maCanvasHelper.init( *mpDevice, rDeviceHelper, rSize );
}
CanvasBitmap::CanvasBitmap( const CanvasBitmap& rSrc ) :
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 3cb5ec9fe217..75c1dda8dfa0 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -44,7 +44,7 @@ namespace oglcanvas
"CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
::canvas::tools::setIdentityAffineMatrix2D(maTransformation);
- maCanvasHelper.init( *rRefDevice.get(),
+ maCanvasHelper.init( *rRefDevice,
rDeviceHelper );
}
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 143f7a2212e8..739583a14bdc 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -52,12 +52,12 @@ namespace vclcanvas
OutputDevice& BackBuffer::getOutDev()
{
- return *maVDev.get();
+ return *maVDev;
}
const OutputDevice& BackBuffer::getOutDev() const
{
- return *maVDev.get();
+ return *maVDev;
}
void BackBuffer::setSize( const ::Size& rNewSize )
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index cdbceba7cff2..ddedf22ce205 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -939,7 +939,7 @@ namespace vclcanvas
const vcl::Region aPolyClipRegion( aPolyPoly );
pVDev->SetClipRegion( aPolyClipRegion );
- textureFill( *pVDev.get(),
+ textureFill( *pVDev,
*pGrfObj,
aOutPos,
aIntegerNextTileX,
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index b1a9f61275f9..d5961df2b777 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -118,7 +118,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
false,
- *rDevice.get(),
+ *rDevice,
mpOutDev ) );
}
@@ -139,7 +139,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
true,
- *rDevice.get(),
+ *rDevice,
mpOutDev ) );
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 2365023f52a8..98f40a5087a7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -263,7 +263,7 @@ namespace vclcanvas
// repaint all active sprites on top of background into
// VDev.
- OutputDevice& rTmpOutDev( *maVDev.get() );
+ OutputDevice& rTmpOutDev( *maVDev );
mpRedrawManager->forEachSprite(
[&rTmpOutDev]( const ::canvas::Sprite::Reference& rSprite )
{ spriteRedraw( rTmpOutDev, rSprite ); }
@@ -534,7 +534,7 @@ namespace vclcanvas
rSpriteScreenPos - vcl::unotools::b2DPointFromPoint(aOutputPosition)
);
- pSprite->redraw( *maVDev.get(), rSpriteRenderPos, true );
+ pSprite->redraw( *maVDev, rSpriteRenderPos, true );
}
}
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 18307fce9c0a..0585a38c41f8 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -104,7 +104,7 @@ namespace vclcanvas
ScopedVclPtrInstance< VirtualDevice > pVDev( rOutDev );
pVDev->SetFont( mpFont->getVCLFont() );
- setupLayoutMode( *pVDev.get(), mnTextDirection );
+ setupLayoutMode( *pVDev, mnTextDirection );
const rendering::ViewState aViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
@@ -152,7 +152,7 @@ namespace vclcanvas
ScopedVclPtrInstance< VirtualDevice > pVDev( rOutDev );
pVDev->SetFont( mpFont->getVCLFont() );
- setupLayoutMode( *pVDev.get(), mnTextDirection );
+ setupLayoutMode( *pVDev, mnTextDirection );
const rendering::ViewState aViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
@@ -229,7 +229,7 @@ namespace vclcanvas
// relative to baseline
const ::FontMetric& aMetric( pVDev->GetFontMetric() );
- setupLayoutMode( *pVDev.get(), mnTextDirection );
+ setupLayoutMode( *pVDev, mnTextDirection );
const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );