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 /oox | |
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 'oox')
-rw-r--r-- | oox/source/ppt/pptgraphicshapecontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptshape.cxx | 4 | ||||
-rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx index 5c29417140f9..f40e6468ba9c 100644 --- a/oox/source/ppt/pptgraphicshapecontext.cxx +++ b/oox/source/ppt/pptgraphicshapecontext.cxx @@ -164,7 +164,7 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok case XML_pic : bUseText = false; } - mpShapePtr->applyShapeReference( *pPlaceholder.get(), bUseText ); + mpShapePtr->applyShapeReference( *pPlaceholder, bUseText ); PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); if ( pPPTShape ) pPPTShape->setReferenced( true ); diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 92c573b6f5ea..362801b8c438 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -328,7 +328,7 @@ void PPTShape::addShape( { aMasterTextListStyle = isOther ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getMasterPersist()->getDefaultTextStyle(); if (aSlideStyle.get()) - aMasterTextListStyle->apply( *aSlideStyle.get() ); + aMasterTextListStyle->apply( *aSlideStyle ); } else { @@ -339,7 +339,7 @@ void PPTShape::addShape( if( aMasterTextListStyle.get() && getTextBody().get() ) { TextListStylePtr aCombinedTextListStyle (new TextListStyle()); - aCombinedTextListStyle->apply( *aMasterTextListStyle.get() ); + aCombinedTextListStyle->apply( *aMasterTextListStyle ); if( mpPlaceholder.get() && mpPlaceholder->getTextBody().get() ) aCombinedTextListStyle->apply( mpPlaceholder->getTextBody()->getTextListStyle() ); diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 0699923610b1..caec14ffe1ba 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -148,7 +148,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con { SAL_INFO("oox.ppt","shape " << mpShapePtr->getId() << " will get shape reference " << pPlaceholder->getId() << " applied"); - mpShapePtr->applyShapeReference( *pPlaceholder.get() ); + mpShapePtr->applyShapeReference( *pPlaceholder ); PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); if ( pPPTShape ) pPPTShape->setReferenced( true ); diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 2d2894e6e4a7..4abd405c234e 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -198,7 +198,7 @@ ShapeContextHandler::getDrawingShapeContext() else { // Reset the handler if fragment path has changed - OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler.get()).getFragmentPath(); + OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler).getFragmentPath(); if ( msRelationFragmentPath != sHandlerFragmentPath ) { mxDrawingFragmentHandler.clear(); @@ -458,7 +458,7 @@ ShapeContextHandler::getShape() } else if (mxLockedCanvasContext.is()) { - ShapePtr pShape = dynamic_cast<LockedCanvasContext&>(*mxLockedCanvasContext.get()).getShape(); + ShapePtr pShape = dynamic_cast<LockedCanvasContext&>(*mxLockedCanvasContext).getShape(); if (pShape) { basegfx::B2DHomMatrix aMatrix; @@ -486,7 +486,7 @@ ShapeContextHandler::getShape() } else if (mxWpsContext.is()) { - ShapePtr pShape = dynamic_cast<WpsContext&>(*mxWpsContext.get()).getShape(); + ShapePtr pShape = dynamic_cast<WpsContext&>(*mxWpsContext).getShape(); if (pShape) { basegfx::B2DHomMatrix aMatrix; @@ -499,7 +499,7 @@ ShapeContextHandler::getShape() } else if (mxWpgContext.is()) { - ShapePtr pShape = dynamic_cast<WpgContext&>(*mxWpgContext.get()).getShape(); + ShapePtr pShape = dynamic_cast<WpgContext&>(*mxWpgContext).getShape(); if (pShape) { basegfx::B2DHomMatrix aMatrix; |