mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:nullptr (automatic rewrite)

Browse Source 
Change-Id: I11a107dadd064452b983c69356e7562ed36c8bc3
This commit is contained in:
Stephan Bergmann
2015-11-10 10:09:52 +01:00
parent 3fbe1c814d
commit cb0fb3edd4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
animations/source/animcore/animcore.cxx
View File

@@ -403,7 +403,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; Sequence< Type >* AnimationNode::mpTypes[] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
AnimationNode::AnimationNode( sal_Int16 nNodeType ) AnimationNode::AnimationNode( sal_Int16 nNodeType )
: maChangeListener(maMutex), : maChangeListener(maMutex),
@@ -415,7 +415,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
mfAcceleration( 0.0 ), mfAcceleration( 0.0 ),
mfDecelerate( 0.0 ), mfDecelerate( 0.0 ),
mbAutoReverse( false ), mbAutoReverse( false ),
mpParent(0), mpParent(nullptr),
mnValueType( 0 ), mnValueType( 0 ),
mnSubItem( 0 ), mnSubItem( 0 ),
mnCalcMode( (nNodeType == AnimationNodeType::ANIMATEMOTION) ? AnimationCalcMode::PACED : AnimationCalcMode::LINEAR), mnCalcMode( (nNodeType == AnimationNodeType::ANIMATEMOTION) ? AnimationCalcMode::PACED : AnimationCalcMode::LINEAR),
@@ -456,7 +456,7 @@ AnimationNode::AnimationNode( const AnimationNode& rNode )
mfDecelerate( rNode.mfDecelerate ), mfDecelerate( rNode.mfDecelerate ),
mbAutoReverse( rNode.mbAutoReverse ), mbAutoReverse( rNode.mbAutoReverse ),
maUserData( rNode.maUserData ), maUserData( rNode.maUserData ),
mpParent(0), mpParent(nullptr),
// attributes for XAnimate // attributes for XAnimate
maTarget( rNode.maTarget ), maTarget( rNode.maTarget ),
@@ -1242,7 +1242,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent )
{ {
mxParent = Parent; mxParent = Parent;
mpParent = 0; mpParent = nullptr;
Reference< XUnoTunnel > xTunnel( mxParent.get(), UNO_QUERY ); Reference< XUnoTunnel > xTunnel( mxParent.get(), UNO_QUERY );
if( xTunnel.is() ) if( xTunnel.is() )
mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() ))); mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
@@ -1987,7 +1987,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) if( ::std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException(); throw ElementExistException();
Reference< XInterface > xNull( 0 ); Reference< XInterface > xNull( nullptr );
oldChild->setParent( xNull ); oldChild->setParent( xNull );
(*replace) = newChild; (*replace) = newChild;
@@ -2013,7 +2013,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
if( old == maChildren.end() ) if( old == maChildren.end() )
throw NoSuchElementException(); throw NoSuchElementException();
Reference< XInterface > xNull( 0 ); Reference< XInterface > xNull( nullptr );
oldChild->setParent( xNull ); oldChild->setParent( xNull );
maChildren.erase( old ); maChildren.erase( old );