From 01b49802c7cda7fd4d5ba71263cef7bc95234b89 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:25:48 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0 --- sw/source/filter/ww8/ww8toolbar.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sw/source/filter/ww8/ww8toolbar.cxx') diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 7f833e4256ad..c447e35e48d4 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -91,13 +91,13 @@ SwCTBWrapper::~SwCTBWrapper() Customization* SwCTBWrapper::GetCustomizaton( sal_Int16 index ) { if ( index < 0 || index >= static_cast( rCustomizations.size() ) ) - return NULL; + return nullptr; return &rCustomizations[ index ]; } SwCTB* SwCTBWrapper::GetCustomizationData( const OUString& sTBName ) { - SwCTB* pCTB = NULL; + SwCTB* pCTB = nullptr; for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it ) { if ( it->GetCustomizationData() && it->GetCustomizationData()->GetName() == sTBName ) @@ -177,7 +177,7 @@ SwTBC* SwCTBWrapper::GetTBCAtOffset( sal_uInt32 nStreamOffset ) if ( (*it).GetOffset() == nStreamOffset ) return &(*it); } - return NULL; + return nullptr; } #if OSL_DEBUG_LEVEL > 1 @@ -832,7 +832,7 @@ Tcg255::~Tcg255() bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS ) { - Tcg255SubStruct* pSubStruct = NULL; + Tcg255SubStruct* pSubStruct = nullptr; switch ( nId ) { case 0x1: @@ -985,7 +985,7 @@ void PlfMcd::Print( FILE* fp ) PlfAcd::PlfAcd( bool bReadId ) : Tcg255SubStruct( bReadId ) ,iMac(0) -,rgacd(NULL) +,rgacd(nullptr) { } @@ -1037,7 +1037,7 @@ void PlfAcd::Print( FILE* fp ) PlfKme::PlfKme( bool bReadId ) : Tcg255SubStruct( bReadId ) ,iMac( 0 ) -,rgkme( NULL ) +,rgkme( nullptr ) { } @@ -1103,7 +1103,7 @@ void TcgSttbf::Print( FILE* fp ) TcgSttbfCore::TcgSttbfCore() : fExtend( 0 ) ,cData( 0 ) ,cbExtra( 0 ) -,dataItems( NULL ) +,dataItems( nullptr ) { } @@ -1151,7 +1151,7 @@ void TcgSttbfCore::Print( FILE* fp ) MacroNames::MacroNames( bool bReadId ) : Tcg255SubStruct( bReadId ) ,iMac( 0 ) -,rgNames( NULL ) +,rgNames( nullptr ) { } -- cgit