summaryrefslogtreecommitdiff
path: root/sd/source/filter/ppt/pptatom.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:23:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:38 +0100
commit92c697c0e3e4bde88424322875c993c161696b1e (patch)
treeea1be62a0cb8fd7f7e63dd03a52441cedd8e96eb /sd/source/filter/ppt/pptatom.cxx
parent65464ed0985802edb96dbcbd1c3eed996f3778bd (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: If1b80da64ba575f07b31dce9bc0e34b7eb9f11a4
Diffstat (limited to 'sd/source/filter/ppt/pptatom.cxx')
-rw-r--r--sd/source/filter/ppt/pptatom.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx
index 69d964a7dba7..5536d2a55d4a 100644
--- a/sd/source/filter/ppt/pptatom.cxx
+++ b/sd/source/filter/ppt/pptatom.cxx
@@ -25,8 +25,8 @@ using namespace ppt;
Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
: mrStream( rStream )
, maRecordHeader( rRecordHeader )
-, mpFirstChild( 0 )
-, mpNextAtom( 0 )
+, mpFirstChild( nullptr )
+, mpNextAtom( nullptr )
{
if( isContainer() )
{
@@ -34,7 +34,7 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
{
DffRecordHeader aChildHeader;
- Atom* pLastAtom = NULL;
+ Atom* pLastAtom = nullptr;
// retrieve file size (to allow sanity checks)
const sal_Size nStreamPos = mrStream.Tell();
@@ -54,7 +54,7 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
if( pLastAtom )
pLastAtom->mpNextAtom = pAtom;
- if( mpFirstChild == NULL )
+ if( mpFirstChild == nullptr )
mpFirstChild = pAtom;
pLastAtom = pAtom;
@@ -89,14 +89,14 @@ Atom* Atom::import( const DffRecordHeader& rRootRecordHeader, SvStream& rStCtrl
else
{
delete pRootAtom;
- return NULL;
+ return nullptr;
}
}
/** returns the next child atom after pLast with nRecType or NULL */
const Atom* Atom::findNextChildAtom( sal_uInt16 nRecType, const Atom* pLast ) const
{
- Atom* pChild = pLast != NULL ? pLast->mpNextAtom : mpFirstChild;
+ Atom* pChild = pLast != nullptr ? pLast->mpNextAtom : mpFirstChild;
while( pChild && pChild->maRecordHeader.nRecType != nRecType )
{
pChild = pChild->mpNextAtom;