From 6cd7bf2043146a630925a2e49336f02c802f707a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 10 Nov 2015 10:25:28 +0100 Subject: loplugin:nullptr (automatic rewrite) Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5 --- svx/source/items/SmartTagItem.cxx | 2 +- svx/source/items/customshapeitem.cxx | 10 +++--- svx/source/items/drawitem.cxx | 2 +- svx/source/items/galleryitem.cxx | 2 +- svx/source/items/hlnkitem.cxx | 4 +-- svx/source/items/numfmtsh.cxx | 66 ++++++++++++++++++------------------ svx/source/items/numinf.cxx | 14 ++++---- svx/source/items/viewlayoutitem.cxx | 2 +- svx/source/items/zoomslideritem.cxx | 2 +- 9 files changed, 52 insertions(+), 52 deletions(-) (limited to 'svx/source/items') diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 6e8f16f3e77b..5ba83719d0cb 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -97,7 +97,7 @@ SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index b0ed1bbb3418..952438888a3b 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -60,7 +60,7 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { - css::uno::Any* pRet = NULL; + css::uno::Any* pRet = nullptr; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; @@ -69,7 +69,7 @@ css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) const { - const css::uno::Any* pRet = NULL; + const css::uno::Any* pRet = nullptr; PropertyHashMap::const_iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; @@ -78,7 +78,7 @@ const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const O css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { - css::uno::Any* pRet = NULL; + css::uno::Any* pRet = nullptr; css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { @@ -98,7 +98,7 @@ css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) const { - const css::uno::Any* pRet = NULL; + const css::uno::Any* pRet = nullptr; const css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { @@ -166,7 +166,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName else { css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); - if( pSeqAny == NULL ) + if( pSeqAny == nullptr ) { css::uno::Sequence < beans::PropertyValue > aSeq; beans::PropertyValue aValue; diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 01313a3d2ed4..423cab1e6fb8 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -228,7 +228,7 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const QUERY_PUT_IMPL( SvxBitmapListItem, BitmapList ) SvxDashListItem::SvxDashListItem() : - pDashList( 0 ) + pDashList( nullptr ) { } diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index cde11d03b8fe..095a4c80663e 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -145,7 +145,7 @@ SvStream& SvxGalleryItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ SfxPoolItem* SvxGalleryItem::Create(SvStream& , sal_uInt16) const { - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 318a3b22176d..f14d683b0224 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -201,7 +201,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ): if( rHyperlinkItem.GetMacroTable() ) pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() ); else - pMacroTable=NULL; + pMacroTable=nullptr; }; @@ -219,7 +219,7 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, const OUString& rName, c if (pMacroTbl) pMacroTable = new SvxMacroTableDtor ( *pMacroTbl ); else - pMacroTable=NULL; + pMacroTable=nullptr; } SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 612d6c1cbe33..b7be0282428b 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -67,13 +67,13 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, SvxNumberValueType eNumValType, const OUString& rNumStr ) : pFormatter ( pNumFormatter ) - , pCurFmtTable ( NULL ) + , pCurFmtTable ( nullptr ) , eValType ( eNumValType ) , bUndoAddList ( true ) , nCurFormatKey ( nFormatKey ) , nCurCategory (css::util::NumberFormat::ALL) , eCurLanguage (LANGUAGE_NONE) - , pCurCurrencyEntry(NULL) + , pCurCurrencyEntry(nullptr) , bBankingSymbol (false) , nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) , bUseStarFormat (false) @@ -100,13 +100,13 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, double nNumVal, const OUString* pNumStr ) : pFormatter ( pNumFormatter ) - , pCurFmtTable ( NULL ) + , pCurFmtTable ( nullptr ) , eValType ( eNumValType ) , bUndoAddList ( true ) , nCurFormatKey ( nFormatKey ) , nCurCategory (css::util::NumberFormat::ALL) , eCurLanguage (LANGUAGE_NONE) - , pCurCurrencyEntry(NULL) + , pCurCurrencyEntry(nullptr) , bBankingSymbol (false) , nCurCurrencyEntryPos((sal_uInt16) SELPOS_NONE) , bUseStarFormat (false) @@ -185,7 +185,7 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, eCurLanguage ) ); // reinitialize currency if category newly entered if ( nCurCategory == css::util::NumberFormat::CURRENCY && nOldCategory != nCurCategory ) - pCurCurrencyEntry = NULL; + pCurCurrencyEntry = nullptr; rFmtSelPos = FillEntryList_Impl( rFmtEntries ); } @@ -423,7 +423,7 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, Color*& rpFontColor ) { - rpFontColor = NULL; + rpFontColor = nullptr; sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) @@ -467,7 +467,7 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { const SvNumberformat* pNumEntry = pFormatter->GetEntry(nFound); - if(pNumEntry!=NULL && pNumEntry->HasNewCurrency()) + if(pNumEntry!=nullptr && pNumEntry->HasNewCurrency()) { bool bTestBanking; sal_uInt16 nPos=FindCurrencyTableEntry(rFmtString,bTestBanking); @@ -519,7 +519,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, { // precondition: number formater found - DBG_ASSERT( pFormatter != NULL, "Zahlenformatierer nicht gefunden!" ); + DBG_ASSERT( pFormatter != nullptr, "Zahlenformatierer nicht gefunden!" ); short nSelPos = SELPOS_NONE; @@ -593,7 +593,7 @@ void SvxNumberFormatShell::FillEListWithStd_Impl( std::vector& rList, * Ist die Liste leer oder gibt es kein aktuelles Format, * so wird SELPOS_NONE geliefert. */ - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); aCurrencyFormatList.clear(); @@ -673,7 +673,7 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl( std::vector& rL const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry==NULL) continue; + if(pNumEntry==nullptr) continue; nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -708,7 +708,7 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl( std::vector& r nNFEntry=pFormatter->GetFormatIndex((NfIndexTableOffset)nIndex,eCurLanguage); const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -736,7 +736,7 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl( std::vector& r * Ist die Liste leer oder gibt es kein aktuelles Format, * so wird SELPOS_NONE geliefert. */ - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); const NfCurrencyEntry* pTmpCurrencyEntry; bool bTmpBanking; @@ -745,8 +745,8 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl( std::vector& r bool bFlag=pFormatter->GetNewCurrencySymbolString(nCurFormatKey,rSymbol, &pTmpCurrencyEntry,&bTmpBanking); - if( (!bFlag && pCurCurrencyEntry==NULL) || - (bFlag && pTmpCurrencyEntry==NULL && rSymbol.isEmpty()) || + if( (!bFlag && pCurCurrencyEntry==nullptr) || + (bFlag && pTmpCurrencyEntry==nullptr && rSymbol.isEmpty()) || (nCurCategory==css::util::NumberFormat::ALL)) { if ( nCurCategory == css::util::NumberFormat::ALL ) @@ -772,7 +772,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector& rL */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); sal_uInt32 nNFEntry; OUString aStrComment; @@ -792,7 +792,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector& rL const SvNumberformat* pNumEntry = pFormatter->GetEntry(nNFEntry); - if(pNumEntry==NULL) continue; + if(pNumEntry==nullptr) continue; nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; aStrComment=pNumEntry->GetComment(); @@ -830,7 +830,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector& rL &pTmpCurrencyEntry, &bTmpBanking); - bUserNewCurrency=(pTmpCurrencyEntry!=NULL); + bUserNewCurrency=(pTmpCurrencyEntry!=nullptr); } if(!bUserNewCurrency &&(pNumEntry->GetType() & css::util::NumberFormat::DEFINED)) @@ -861,7 +861,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector& r */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); OUString aStrComment; OUString aNewFormNInfo; @@ -881,7 +881,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector& r OUString rShortSymbol; - if(pCurCurrencyEntry==NULL) + if(pCurCurrencyEntry==nullptr) { // #110398# If no currency format was previously selected (we're not // about to add another currency), try to select the initial currency @@ -904,7 +904,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector& r bTmpBanking=bBankingSymbol; } - if(pTmpCurrencyEntry!=NULL) + if(pTmpCurrencyEntry!=nullptr) { rSymbol = pTmpCurrencyEntry->BuildSymbolString(false); rBankSymbol = pTmpCurrencyEntry->BuildSymbolString(true); @@ -1055,7 +1055,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector& rList, */ sal_uInt16 nMyType; - DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); + DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" ); OUString aStrComment; OUString aNewFormNInfo; @@ -1105,7 +1105,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector& rList, void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { - rpColor = NULL; + rpColor = nullptr; // #50441# if a string was set in addition to the value, use it for text formats bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || @@ -1203,7 +1203,7 @@ void SvxNumberFormatShell::MakePrevStringFromVal( Color*& rpFontColor, double nValue) { - rpFontColor = NULL; + rpFontColor = nullptr; pFormatter->GetPreviewString( rFormatStr, nValue, rPreviewStr, &rpFontColor, eCurLanguage ); } @@ -1219,7 +1219,7 @@ void SvxNumberFormatShell::SetComment4Entry(short nEntry, const OUString& aEntSt if(nEntry<0) return; sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; pNumEntry = const_cast(pFormatter->GetEntry(nMyNfEntry)); - if(pNumEntry!=NULL) pNumEntry->SetComment(aEntStr); + if(pNumEntry!=nullptr) pNumEntry->SetComment(aEntStr); } /* @@ -1237,7 +1237,7 @@ OUString SvxNumberFormatShell::GetComment4Entry(short nEntry) { sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) return pNumEntry->GetComment(); } @@ -1261,7 +1261,7 @@ short SvxNumberFormatShell::GetCategory4Entry(short nEntry) const { const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); sal_uInt16 nMyCat,nMyType; - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { nMyCat=pNumEntry->GetType() & ~css::util::NumberFormat::DEFINED; CategoryToPos_Impl(nMyCat,nMyType); @@ -1293,7 +1293,7 @@ bool SvxNumberFormatShell::GetUserDefined4Entry(short nEntry) sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) { if((pNumEntry->GetType() & css::util::NumberFormat::DEFINED)>0) { @@ -1325,7 +1325,7 @@ OUString SvxNumberFormatShell::GetFormat4Entry(short nEntry) sal_uInt32 nMyNfEntry=aCurEntryList[nEntry]; const SvNumberformat *pNumEntry = pFormatter->GetEntry(nMyNfEntry); - if(pNumEntry!=NULL) + if(pNumEntry!=nullptr) return pNumEntry->GetFormatstring(); } return OUString(); @@ -1393,11 +1393,11 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector& rList, sal_ { const NfCurrencyEntry* pTmpCurrencyEntry=SvNumberFormatter::MatchSystemCurrency(); - bool bFlag=(pTmpCurrencyEntry==NULL); + bool bFlag=(pTmpCurrencyEntry==nullptr); GetCurrencySymbols(rList, bFlag); - if(pPos!=NULL) + if(pPos!=nullptr) { const NfCurrencyTable& rCurrencyTable=SvNumberFormatter::GetTheCurrencyTable(); sal_uInt16 nTableCount=rCurrencyTable.size(); @@ -1517,7 +1517,7 @@ void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos) } else { - pCurCurrencyEntry=NULL; + pCurCurrencyEntry=nullptr; nCurCurrencyEntryPos=0; nCurFormatKey=pFormatter->GetFormatIndex( NF_CURRENCY_1000DEC2_RED, eCurLanguage); @@ -1578,7 +1578,7 @@ sal_uInt16 SvxNumberFormatShell::FindCurrencyTableEntry( const OUString& rFmtStr OUString aSymbol, aExtension; sal_uInt32 nFound = pFormatter->TestNewString( rFmtString, eCurLanguage ); if ( nFound != NUMBERFORMAT_ENTRY_NOT_FOUND && - ((pFormat = pFormatter->GetEntry( nFound )) != 0) && + ((pFormat = pFormatter->GetEntry( nFound )) != nullptr) && pFormat->GetNewCurrencySymbol( aSymbol, aExtension ) ) { // eventually match with format locale const NfCurrencyEntry* pTmpCurrencyEntry = @@ -1665,7 +1665,7 @@ bool SvxNumberFormatShell::IsInTable(sal_uInt16 const nPos, const NfCurrencyEntry* pTmpCurrencyEntry=&rCurrencyTable[nPos]; - if ( pTmpCurrencyEntry!=NULL) + if ( pTmpCurrencyEntry!=nullptr) { pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking ); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index fe378314c421..a6348bc99234 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -30,12 +30,12 @@ TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); eValueType ( eVal ), \ aStringVal ( rStr ), \ nDoubleVal ( nDouble ), \ - pDelFormatArr ( NULL ), \ + pDelFormatArr ( nullptr ), \ nDelCount ( 0 ) SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : - INIT( NULL, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) + INIT( nullptr, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) { } @@ -93,7 +93,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : eValueType ( rItem.eValueType ), aStringVal ( rItem.aStringVal ), nDoubleVal ( rItem.nDoubleVal ), - pDelFormatArr( NULL ), + pDelFormatArr( nullptr ), nDelCount ( rItem.nDelCount ) { @@ -141,7 +141,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { if ( nDelCount > 0 ) { - if ( pDelFormatArr != NULL && rOther.pDelFormatArr != NULL ) + if ( pDelFormatArr != nullptr && rOther.pDelFormatArr != nullptr ) { bEqual = true; @@ -150,7 +150,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const } } else if ( nDelCount == 0 ) - bEqual = ( pDelFormatArr == NULL && rOther.pDelFormatArr == NULL ); + bEqual = ( pDelFormatArr == nullptr && rOther.pDelFormatArr == nullptr ); bEqual = bEqual && pFormatter == rOther.pFormatter && @@ -191,7 +191,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, if ( pDelFormatArr ) { delete []pDelFormatArr; - pDelFormatArr = NULL; + pDelFormatArr = nullptr; } nDelCount = nCount; @@ -200,7 +200,7 @@ void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, { pDelFormatArr = new sal_uInt32[ nCount ]; - if ( pData != NULL ) + if ( pData != nullptr ) { for ( sal_uInt32 i = 0; i < nCount; ++i ) pDelFormatArr[i] = pData[i]; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index d073187cffe9..7c6cde664c92 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -70,7 +70,7 @@ SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { - return 0; + return nullptr; } diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index c6b1f22e8ef9..5d776322fdf9 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -68,7 +68,7 @@ SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { - return 0; + return nullptr; } -- cgit