diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-27 16:00:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-27 19:51:58 +0200 |
| commit | c3fbda80eb1d52239d8992eaadeabf89ee57170f (patch) | |
| tree | 78222fa05db572e36382613867e765a1010d54ed /oox | |
| parent | a59a532371e3c4eb20e293dcdb4df812ee5506d0 (diff) | |
Further fixing of loplugin:simplifypointertobool for libstdc++ std::shared_ptr
...after fe6cce01c88d045a1fcf09acf049c34c22299b02 "Fix
loplugin:simplifypointertobool for libstdc++ std::shared_ptr", this time for
uses of oox::drawingml::chart::ModelRef, which derives from std::shared_ptr.
Change-Id: I7e9620da52b3f6d26c6fe6d7909888c3a221c164
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94975
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/titleconverter.cxx | 2 | ||||
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 6 | ||||
| -rw-r--r-- | oox/source/dump/oledumper.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index a4a2d9c1ec89..c4bf45dea739 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -238,7 +238,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) } bool bManualLayout=false; // manual positioning and size - if( mrModel.mxLayout.get() ) + if( mrModel.mxLayout ) { LayoutConverter aLayoutConv( *this, *mrModel.mxLayout ); // manual size needs ChartLegendExpansion_CUSTOM diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 775790a20eed..8fcb7277b2e4 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2015,7 +2015,7 @@ void InputObjectBase::construct( const InputObjectBase& rParent ) bool InputObjectBase::implIsValid() const { - return mxStrm.get() && OutputObjectBase::implIsValid(); + return mxStrm && OutputObjectBase::implIsValid(); } void InputObjectBase::skipBlock( sal_Int64 nBytes, bool bShowSize ) @@ -2318,7 +2318,7 @@ void TextStreamObjectBase::implDump() void TextStreamObjectBase::constructTextStrmObj( rtl_TextEncoding eTextEnc ) { - if( mxStrm.get() ) + if( mxStrm ) mxTextStrm = std::make_shared<TextInputStream>( getContext(), *mxStrm, eTextEnc ); } @@ -2450,7 +2450,7 @@ void RecordObjectBase::construct( const ObjectBase& rParent, bool RecordObjectBase::implIsValid() const { - return mxBaseStrm.get() && InputObjectBase::implIsValid(); + return mxBaseStrm && InputObjectBase::implIsValid(); } void RecordObjectBase::implDump() diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index 80485c453b7c..290ace6b39c0 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -1859,7 +1859,7 @@ VbaDirStreamObject::VbaDirStreamObject( const ObjectBase& rParent, mrVbaData( rVbaData ) { mxInStrm = rxStrm; - if( mxInStrm.get() ) + if( mxInStrm ) { BinaryInputStreamRef xVbaStrm( std::make_shared<::oox::ole::VbaInputStream>( *mxInStrm ) ); SequenceRecordObjectBase::construct( rParent, xVbaStrm, rSysFileName, "VBA-DIR-RECORD-NAMES", "VBA-DIR-SIMPLE-RECORDS" ); @@ -1868,7 +1868,7 @@ VbaDirStreamObject::VbaDirStreamObject( const ObjectBase& rParent, bool VbaDirStreamObject::implIsValid() const { - return mxInStrm.get() && SequenceRecordObjectBase::implIsValid(); + return mxInStrm && SequenceRecordObjectBase::implIsValid(); } bool VbaDirStreamObject::implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) |