diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:20:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:32 +0100 |
commit | 8d12f43bb3668f4fdfcef0bd149d8b023e312e18 (patch) | |
tree | 989292510ee579777678940fcb5c93d75c3925dd /oox/source/helper | |
parent | 1ddbbfdda834965c861a67e275ab58ff4d1f0bf9 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I62a20b440064aca6f102e61cb3984bb95e739a4f
Diffstat (limited to 'oox/source/helper')
-rw-r--r-- | oox/source/helper/attributelist.cxx | 10 | ||||
-rw-r--r-- | oox/source/helper/binaryinputstream.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/binarystreambase.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/textinputstream.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 160e3a935bd6..70abbc1e521f 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -107,16 +107,16 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString& rValue ) AttributeList::AttributeList( const Reference< XFastAttributeList >& rxAttribs ) : mxAttribs( rxAttribs ), - mpAttribList( NULL ) + mpAttribList( nullptr ) { OSL_ENSURE( mxAttribs.is(), "AttributeList::AttributeList - missing attribute list interface" ); } sax_fastparser::FastAttributeList *AttributeList::getAttribList() const { - if( mpAttribList == NULL ) + if( mpAttribList == nullptr ) { - assert( dynamic_cast< sax_fastparser::FastAttributeList *>( mxAttribs.get() ) != NULL ); + assert( dynamic_cast< sax_fastparser::FastAttributeList *>( mxAttribs.get() ) != nullptr ); mpAttribList = static_cast< sax_fastparser::FastAttributeList *>( mxAttribs.get() ); } return mpAttribList; @@ -263,10 +263,10 @@ OUString AttributeList::getXString( sal_Int32 nAttrToken, const OUString& rDefau const char* AttributeList::getChar( sal_Int32 nAttrToken ) const { - const char* p = NULL; + const char* p = nullptr; bool bValid = getAttribList()->getAsChar(nAttrToken, p); if (!bValid) - p = NULL; + p = nullptr; return p; } diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 61677a1d1725..a8e06835a6ae 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -279,7 +279,7 @@ void RelativeInputStream::seek( sal_Int64 nPos ) void RelativeInputStream::close() { - mpInStrm = 0; + mpInStrm = nullptr; mbEof = true; } diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index 929fb6069b52..cd1f25dc8fb4 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -136,7 +136,7 @@ void SequenceSeekableStream::seek( sal_Int64 nPos ) void SequenceSeekableStream::close() { - mpData = 0; + mpData = nullptr; mbEof = true; } diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 2d0e31493ca5..0e363b16baa2 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -97,7 +97,7 @@ void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, I { ensureConnected(); mpInStrm->close(); - mpInStrm = 0; + mpInStrm = nullptr; } void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException) |