diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-09 16:39:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-09 20:42:44 +0200 |
| commit | 7d361e96c9ea822790db21806e9fc05279423833 (patch) | |
| tree | 4a158bdac2bd6df4ec2fc3c5a810003c1dd41ff6 /oox | |
| parent | 4b0afe968ed62ac65d5f04918f4cda501ecf1619 (diff) | |
loplugin:redundantpointerops
(All related to uses of std::shared_ptr, which builds against libstdc++
apparently missed (fix forthcoming) and which I only now found with my macOS
build against libc++.)
Change-Id: If581e689f0e5ff62d9ce35513c9ff87b00328766
Reviewed-on: https://gerrit.libreoffice.org/80548
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index eba300fc89d5..be8153ef155a 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -327,16 +327,16 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) SAL_INFO("oox.drawingml", "Shape::applyShapeReference: apply '" << rReferencedShape.msId << "' to '" << msId << "'"); if ( rReferencedShape.mpTextBody.get() && bUseText ) - mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody.get() ); + mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody ); else mpTextBody.reset(); maShapeProperties = rReferencedShape.maShapeProperties; mpShapeRefLinePropPtr = std::make_shared<LineProperties>( rReferencedShape.getActualLineProperties(nullptr) ); mpShapeRefFillPropPtr = std::make_shared<FillProperties>( rReferencedShape.getActualFillProperties(nullptr, nullptr) ); - mpCustomShapePropertiesPtr = std::make_shared<CustomShapeProperties>( *rReferencedShape.mpCustomShapePropertiesPtr.get() ); - mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr.get() ) : nullptr ); + mpCustomShapePropertiesPtr = std::make_shared<CustomShapeProperties>( *rReferencedShape.mpCustomShapePropertiesPtr ); + mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr ) : nullptr ); mpShapeRefEffectPropPtr = std::make_shared<EffectProperties>( rReferencedShape.getActualEffectProperties(nullptr) ); - mpMasterTextListStyle = std::make_shared<TextListStyle>( *rReferencedShape.mpMasterTextListStyle.get() ); + mpMasterTextListStyle = std::make_shared<TextListStyle>( *rReferencedShape.mpMasterTextListStyle ); maSize = rReferencedShape.maSize; maPosition = rReferencedShape.maPosition; mnRotation = rReferencedShape.mnRotation; |