diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-07 13:52:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-08 10:38:35 +0100 |
commit | 17dd2662ccfa9d04efbea74e5d7548db5b2126d4 (patch) | |
tree | 37c0de883c43a57f54b0a483437da9de3bf4c941 /vcl/source | |
parent | 638be04c8334e5e29f9258ff870fbe63603ce7e0 (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 'vcl/source')
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/impanmvw.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print2.cxx | 18 | ||||
-rw-r--r-- | vcl/source/graphic/GraphicObject2.cxx | 4 | ||||
-rw-r--r-- | vcl/source/graphic/Manager.cxx | 2 | ||||
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 2 | ||||
-rw-r--r-- | vcl/source/uitest/uiobject.cxx | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 13b57d27e1e0..db292eebb298 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1024,7 +1024,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) { MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction); - ImplAddGradientEx( aMtf, *aMapVDev.get(), + ImplAddGradientEx( aMtf, *aMapVDev, ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ), pAct->GetGradient() ); } @@ -1056,7 +1056,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) { // Add rotated gradientex MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction); - ImplAddGradientEx( aMtf, *aMapVDev.get(), + ImplAddGradientEx( aMtf, *aMapVDev, ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ), pAct->GetGradient() ); } diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index 0c13f5fd6f9d..9b5a2de8acfd 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -182,7 +182,7 @@ void ImplAnimView::drawToPos( sal_uLong nPos ) if (xOldClip) pRenderContext->SetClipRegion( maClip ); - pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev.get() ); + pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev ); if (pGuard) pGuard->SetPaintRect(tools::Rectangle(maDispPt, maDispSz)); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 7d1cbbde664d..45c00a8d3f88 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -707,7 +707,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) { // get hairline and full bound rect tools::Rectangle aHairlineRect; - const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev.get(), &aHairlineRect)); + const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev, &aHairlineRect)); if(!aRect.IsEmpty() && !aHairlineRect.IsEmpty()) { diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 8390b97286ab..373acaba0700 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -762,7 +762,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aBackgroundComponent.aBounds, aBackgroundComponent.aBgColor, static_cast<const MetaRectAction*>(pCurrAct)->GetRect(), - *aMapModeVDev.get()) ) + *aMapModeVDev) ) bStillBackground=false; // incomplete occlusion of background else nLastBgAction=nActionNum; // this _is_ background @@ -778,7 +778,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aBackgroundComponent.aBounds, aBackgroundComponent.aBgColor, aPoly.GetBoundRect(), - *aMapModeVDev.get()) ) + *aMapModeVDev) ) bStillBackground=false; // incomplete occlusion of background else nLastBgAction=nActionNum; // this _is_ background @@ -795,7 +795,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aBackgroundComponent.aBounds, aBackgroundComponent.aBgColor, aPoly.GetBoundRect(), - *aMapModeVDev.get()) ) + *aMapModeVDev) ) bStillBackground=false; // incomplete occlusion of background else nLastBgAction=nActionNum; // this _is_ background @@ -807,7 +807,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aBackgroundComponent.aBounds, aBackgroundComponent.aBgColor, static_cast<const MetaWallpaperAction*>(pCurrAct)->GetRect(), - *aMapModeVDev.get()) ) + *aMapModeVDev) ) bStillBackground=false; // incomplete occlusion of background else nLastBgAction=nActionNum; // this _is_ background @@ -816,14 +816,14 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, default: { if( ImplIsNotTransparent( *pCurrAct, - *aMapModeVDev.get() ) ) + *aMapModeVDev ) ) bStillBackground=false; // non-transparent action, possibly // not uniform else // extend current bounds (next uniform action // needs to fully cover this area) aBackgroundComponent.aBounds.Union( - ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) ); + ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) ); break; } } @@ -871,7 +871,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, pCurrAct->Execute( aMapModeVDev.get() ); // cache bounds of current action - const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) ); + const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) ); // accumulate collected bounds here, initialize with current action tools::Rectangle aTotalBounds( aBBCurrAct ); // thus, @@ -897,7 +897,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // not be considered for connected components, // too. Just put each of them into a separate // component. - aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev.get()); + aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev); if( !aBBCurrAct.IsEmpty() && !aTotalComponents.bIsFullyTransparent ) @@ -1294,7 +1294,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // given background color ImplConvertTransparentAction(rOutMtf, *pCurrAct, - *aMapModeVDev.get(), + *aMapModeVDev, aBackgroundComponent.aBgColor); } else diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx index ac3be21a5bfa..7148c1098c87 100644 --- a/vcl/source/graphic/GraphicObject2.cxx +++ b/vcl/source/graphic/GraphicObject2.cxx @@ -306,7 +306,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r aVDev->SetMapMode( aMapMode ); // draw bitmap content - if( ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, + if( ImplRenderTempTile( *aVDev, nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr ) ) { BitmapEx aTileBitmap( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) ); @@ -321,7 +321,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r else aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); - if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, + if( aAlphaGraphic.ImplRenderTempTile( *aVDev, nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr ) ) { // Combine bitmap and alpha/mask diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx index 83c2dfb73529..98ef80eebddc 100644 --- a/vcl/source/graphic/Manager.cxx +++ b/vcl/source/graphic/Manager.cxx @@ -146,7 +146,7 @@ void Manager::unregisterGraphic(ImpGraphic* pImpGraphic) std::shared_ptr<ImpGraphic> Manager::copy(std::shared_ptr<ImpGraphic> const& rImpGraphicPtr) { - auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr.get()); + auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr); registerGraphic(pReturn, "Copy"); return pReturn; } diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 2a42ae235532..b6ea1196c054 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -163,7 +163,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con else if (rPath.endsWith(".svg")) { rParameters.mbWriteImageToCache = true; // We always want to cache a SVG image - vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, aScalePercentage / 100.0); + vcl::bitmap::loadFromSvg(*xStream, rPath, rParameters.mrBitmap, aScalePercentage / 100.0); if (bConvertToDarkTheme) BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter()); diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 899fbb97d75c..37b9636f2906 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -465,7 +465,7 @@ OUString escape(const OUString& rStr) OUString WindowUIObject::dumpState() const { OUStringBuffer aStateString = "{\"name\":\"" + mxWindow->get_id() + "\""; - aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow.get()).name()).append("\""); + aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow).name()).append("\""); StringMap aState = const_cast<WindowUIObject*>(this)->get_state(); for (auto const& elem : aState) { |