diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/source/core/data/documen2.cxx | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/core/data/documen2.cxx')
-rw-r--r-- | sc/source/core/data/documen2.cxx | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index b7cc1ed0689b..5582176f9b61 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -133,40 +133,40 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : mpCellStringPool(new svl::SharedStringPool(ScGlobal::pCharClass)), mpFormulaGroupCxt(nullptr), maCalcConfig( ScInterpreter::GetGlobalConfig()), - mpUndoManager( NULL ), - pEditEngine( NULL ), - pNoteEngine( NULL ), + mpUndoManager( nullptr ), + pEditEngine( nullptr ), + pNoteEngine( nullptr ), pShell( pDocShell ), - pPrinter( NULL ), - pVirtualDevice_100th_mm( NULL ), - pDrawLayer( NULL ), - pValidationList( NULL ), - pFormatExchangeList( NULL ), - pRangeName(NULL), - pDPCollection( NULL ), - pFormulaTree( NULL ), - pEOFormulaTree( NULL ), - pFormulaTrack( NULL ), - pEOFormulaTrack( NULL ), - pClipData( NULL ), - pDetOpList(NULL), - pChangeTrack( NULL ), - pUnoBroadcaster( NULL ), - pUnoListenerCalls( NULL ), - pUnoRefUndoList( NULL ), - pChangeViewSettings( NULL ), - pScriptTypeData( NULL ), - mpAnonymousDBData( NULL ), - pCacheFieldEditEngine( NULL ), - pViewOptions( NULL ), - pDocOptions( NULL ), - pExtDocOptions( NULL ), - pConsolidateDlgData( NULL ), - pRecursionHelper( NULL ), - pAutoNameCache( NULL ), - pLookupCacheMapImpl( NULL ), - pPreviewFont( NULL ), - pPreviewCellStyle( NULL ), + pPrinter( nullptr ), + pVirtualDevice_100th_mm( nullptr ), + pDrawLayer( nullptr ), + pValidationList( nullptr ), + pFormatExchangeList( nullptr ), + pRangeName(nullptr), + pDPCollection( nullptr ), + pFormulaTree( nullptr ), + pEOFormulaTree( nullptr ), + pFormulaTrack( nullptr ), + pEOFormulaTrack( nullptr ), + pClipData( nullptr ), + pDetOpList(nullptr), + pChangeTrack( nullptr ), + pUnoBroadcaster( nullptr ), + pUnoListenerCalls( nullptr ), + pUnoRefUndoList( nullptr ), + pChangeViewSettings( nullptr ), + pScriptTypeData( nullptr ), + mpAnonymousDBData( nullptr ), + pCacheFieldEditEngine( nullptr ), + pViewOptions( nullptr ), + pDocOptions( nullptr ), + pExtDocOptions( nullptr ), + pConsolidateDlgData( nullptr ), + pRecursionHelper( nullptr ), + pAutoNameCache( nullptr ), + pLookupCacheMapImpl( nullptr ), + pPreviewFont( nullptr ), + pPreviewCellStyle( nullptr ), nUnoObjectId( 0 ), nRangeOverflowType( 0 ), aCurTextWidthCalcPos(MAXCOL,0,0), @@ -235,12 +235,12 @@ ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : } else { - pBASM = NULL; - pChartListenerCollection = NULL; - pRefreshTimerControl = NULL; + pBASM = nullptr; + pChartListenerCollection = nullptr; + pRefreshTimerControl = nullptr; } pDBCollection = new ScDBCollection(this); - pSelectionAttr = NULL; + pSelectionAttr = nullptr; pChartCollection = new ScChartCollection; apTemporaryChartLock.reset( new ScTemporaryChartLock(this) ); xColNameRanges = new ScRangePairList; @@ -317,7 +317,7 @@ void ScDocument::StartChangeTracking() void ScDocument::EndChangeTracking() { delete pChangeTrack; - pChangeTrack = NULL; + pChangeTrack = nullptr; } void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) @@ -377,7 +377,7 @@ ScDocument::~ScDocument() { // To be sure there isn't anything running do it with a protector, // this ensures also that nothing needs the control anymore. ScRefreshTimerProtector aProt( GetRefreshTimerControlAddress() ); - delete pRefreshTimerControl, pRefreshTimerControl = NULL; + delete pRefreshTimerControl, pRefreshTimerControl = nullptr; } mxFormulaParserPool.reset(); @@ -391,10 +391,10 @@ ScDocument::~ScDocument() DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners // destroy BroadcastAreas first to avoid un-needed Single-EndListenings of Formula-Cells delete pBASM; // BroadcastAreaSlotMachine - pBASM = NULL; + pBASM = nullptr; delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING - pUnoBroadcaster = NULL; + pUnoBroadcaster = nullptr; delete pUnoRefUndoList; delete pUnoListenerCalls; @@ -476,7 +476,7 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc ) pSourceDoc->SaveDdeLinks(*pClipData); } else - pClipData = NULL; + pClipData = nullptr; // Options pointers exist (ImplCreateOptions) for any document. // Must be copied for correct results in OLE objects (#i42666#). @@ -555,7 +555,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) { if( i > static_cast<SCTAB>(maTabs.size()) ) { - maTabs.resize(i, NULL ); + maTabs.resize(i, nullptr ); } maTabs.push_back(new ScTable(this, i, aString)); } @@ -575,7 +575,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) InitClipPtrs(pSourceDoc); if (nTab >= static_cast<SCTAB>(maTabs.size())) { - maTabs.resize(nTab+1, NULL ); + maTabs.resize(nTab+1, nullptr ); } maTabs[nTab] = new ScTable(this, nTab, OUString("baeh")); @@ -592,7 +592,7 @@ void ScDocument::EnsureTable( SCTAB nTab ) { bool bExtras = !bIsUndo; // Column-Widths, Row-Heights, Flags if (static_cast<size_t>(nTab) >= maTabs.size()) - maTabs.resize(nTab+1, NULL); + maTabs.resize(nTab+1, nullptr); if (!maTabs[nTab]) maTabs[nTab] = new ScTable(this, nTab, "temp", bExtras, bExtras); @@ -854,7 +854,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM for (TableContainer::iterator it = maTabs.begin(); it != maTabs.end(); ++it) if (*it && it != (maTabs.begin() + nOldPos)) (*it)->UpdateInsertTab(aCxt); - maTabs.push_back(NULL); + maTabs.push_back(nullptr); for (i = static_cast<SCTAB>(maTabs.size())-1; i > nNewPos; i--) maTabs[i] = maTabs[i - 1]; if (nNewPos <= nOldPos) @@ -884,7 +884,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM { SetNoListening( true ); // noch nicht bei CopyToTable/Insert sc::CopyToDocContext aCopyDocCxt(*this); - maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, InsertDeleteFlags::ALL, (pOnlyMarked != NULL), + maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, InsertDeleteFlags::ALL, (pOnlyMarked != nullptr), maTabs[nNewPos], pOnlyMarked ); maTabs[nNewPos]->SetTabBgColor(maTabs[nOldPos]->GetTabBgColor()); @@ -1099,7 +1099,7 @@ ScFormulaCell* ScDocument::SetFormulaCell( const ScAddress& rPos, ScFormulaCell* if (!TableExists(rPos.Tab())) { delete pCell; - return NULL; + return nullptr; } return maTabs[rPos.Tab()]->SetFormulaCell(rPos.Col(), rPos.Row(), pCell); @@ -1124,12 +1124,12 @@ void ScDocument::SetConsolidateDlgData( const ScConsolidateParam* pData ) if ( pData ) pConsolidateDlgData = new ScConsolidateParam( *pData ); else - pConsolidateDlgData = NULL; + pConsolidateDlgData = nullptr; } void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) { - if (pChangeViewSettings==NULL) + if (pChangeViewSettings==nullptr) pChangeViewSettings = new ScChangeViewSettings; OSL_ENSURE( pChangeViewSettings, "Oops. No ChangeViewSettings :-( by!" ); @@ -1139,7 +1139,7 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) ScFieldEditEngine* ScDocument::CreateFieldEditEngine() { - ScFieldEditEngine* pNewEditEngine = NULL; + ScFieldEditEngine* pNewEditEngine = nullptr; if (!pCacheFieldEditEngine) { pNewEditEngine = new ScFieldEditEngine( @@ -1156,7 +1156,7 @@ ScFieldEditEngine* ScDocument::CreateFieldEditEngine() } pNewEditEngine = pCacheFieldEditEngine; - pCacheFieldEditEngine = NULL; + pCacheFieldEditEngine = nullptr; } return pNewEditEngine; } @@ -1170,7 +1170,7 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) } else delete rpEditEngine; - rpEditEngine = NULL; + rpEditEngine = nullptr; } ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() @@ -1180,7 +1180,7 @@ ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange ) { - ScLookupCache* pCache = 0; + ScLookupCache* pCache = nullptr; if (!pLookupCacheMapImpl) pLookupCacheMapImpl = new ScLookupCacheMapImpl; ScLookupCacheMap::iterator it( pLookupCacheMapImpl->aCacheMap.find( rRange)); @@ -1255,7 +1255,7 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder) { if (aRange.In(cell)) { - if (pColCellBoder != NULL) + if (pColCellBoder != nullptr) { aColorChanger.Update( *pAction ); Color aColor( aColorChanger.GetColor() ); @@ -1275,7 +1275,7 @@ bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder) { if (aRange.In(cell)) { - if (pColCellBoder != NULL) + if (pColCellBoder != nullptr) { aColorChanger.Update( *pAction ); Color aColor( aColorChanger.GetColor() ); @@ -1299,9 +1299,9 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos, OUString &aT ScChangeViewSettings* pSettings = GetChangeViewSettings(); if ( pTrack && pTrack->GetFirst() && pSettings && pSettings->ShowChanges()) { - const ScChangeAction* pFound = NULL; - const ScChangeAction* pFoundContent = NULL; - const ScChangeAction* pFoundMove = NULL; + const ScChangeAction* pFound = nullptr; + const ScChangeAction* pFoundContent = nullptr; + const ScChangeAction* pFoundMove = nullptr; long nModified = 0; const ScChangeAction* pAction = pTrack->GetFirst(); while (pAction) @@ -1395,7 +1395,7 @@ void ScDocument::SetPreviewSelection( ScMarkData& rSel ) SfxItemSet* ScDocument::GetPreviewFont( SCCOL nCol, SCROW nRow, SCTAB nTab ) { - SfxItemSet* pRet = NULL; + SfxItemSet* pRet = nullptr; if ( pPreviewFont ) { ScMarkData aSel = GetPreviewSelection(); @@ -1407,7 +1407,7 @@ SfxItemSet* ScDocument::GetPreviewFont( SCCOL nCol, SCROW nRow, SCTAB nTab ) ScStyleSheet* ScDocument::GetPreviewCellStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) { - ScStyleSheet* pRet = NULL; + ScStyleSheet* pRet = nullptr; ScMarkData aSel = GetPreviewSelection(); if ( pPreviewCellStyle && aSel.IsCellMarked( nCol, nRow ) && aSel.GetFirstSelected() == nTab ) pRet = pPreviewCellStyle; |