diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:16:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 6cf30940750607eeb062113dbee9968769d7bd06 (patch) | |
| tree | 5d30410c5f32f45105d896c065da3fffbd5edf88 /oox | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptshape.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 6 | ||||
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 740858e53406..6013c3968a3f 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -281,7 +281,7 @@ void PPTShape::addShape( } if( pPPTPlaceholder->mpPlaceholder.get() ) { SAL_INFO("oox.ppt","placeholder has parent placeholder: " << pPPTPlaceholder->mpPlaceholder->getId() << " type: " << lclDebugSubType( pPPTPlaceholder->mpPlaceholder->getSubType() ) << " index: " << pPPTPlaceholder->mpPlaceholder->getSubTypeIndex().get() ); - SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != NULL) ); + SAL_INFO("oox.ppt","has textbody " << (pPPTPlaceholder->mpPlaceholder->getTextBody() != 0) ); TextListStylePtr pPlaceholderStyle = getSubTypeTextListStyle( rSlidePersist, pPPTPlaceholder->mpPlaceholder->getSubType() ); if( pPPTPlaceholder->mpPlaceholder->getTextBody() ) pNewTextListStyle->apply( pPPTPlaceholder->mpPlaceholder->getTextBody()->getTextListStyle() ); diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index a42fe8d131d4..ac8af0b9bc10 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -63,9 +63,9 @@ oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, co { if ( (*aRevIter)->getSubType() == nMasterPlaceholder ) { - if( !oSubTypeIndex.has() && aChoiceShapePtr1 == NULL ) + if( !oSubTypeIndex.has() && aChoiceShapePtr1 == 0 ) aChoiceShapePtr1 = *aRevIter; - else if( aChoiceShapePtr2 == NULL ) + else if( aChoiceShapePtr2 == 0 ) aChoiceShapePtr2 = *aRevIter; if( (*aRevIter)->getSubTypeIndex() == oSubTypeIndex ) { @@ -79,7 +79,7 @@ oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, co break; ++aRevIter; } - if( aShapePtr == NULL ) + if( aShapePtr == 0 ) return aChoiceShapePtr1 ? aChoiceShapePtr1 : aChoiceShapePtr2; return aShapePtr; } diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index ddba98e6a43b..b53fcb258fff 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -174,7 +174,7 @@ void setTextStyle( Reference< beans::XPropertySet >& rxPropSet, const XmlFilterB oox::drawingml::TextListStylePtr& pTextListStylePtr, int nLevel ) { ::oox::drawingml::TextParagraphPropertiesPtr pTextParagraphPropertiesPtr( pTextListStylePtr->getListStyle()[ nLevel ] ); - if( pTextParagraphPropertiesPtr == NULL ) + if( pTextParagraphPropertiesPtr == 0 ) { // no properties. return return; |