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/ui/unoobj/funcuno.cxx | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/ui/unoobj/funcuno.cxx')
-rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 84ed978b6295..5dc09a3d9c66 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -80,7 +80,7 @@ ScDocument* ScTempDocSource::CreateDocument() ScTempDocSource::ScTempDocSource( ScTempDocCache& rDocCache ) : rCache( rDocCache ), - pTempDoc( NULL ) + pTempDoc( nullptr ) { if ( rCache.IsInUse() ) pTempDoc = CreateDocument(); @@ -109,7 +109,7 @@ ScDocument* ScTempDocSource::GetDocument() } ScTempDocCache::ScTempDocCache() : - pDoc( NULL ), + pDoc( nullptr ), bInUse( false ) { } @@ -130,7 +130,7 @@ void ScTempDocCache::Clear() { OSL_ENSURE( !bInUse, "ScTempDocCache::Clear: bInUse" ); delete pDoc; - pDoc = NULL; + pDoc = nullptr; } // copy results from one document into another @@ -167,14 +167,14 @@ static bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, ScMarkData aDestMark; aDestMark.SelectOneTable( nDestTab ); aDestMark.SetMarkArea( aNewRange ); - pDestDoc->CopyFromClip( aNewRange, aDestMark, InsertDeleteFlags::ALL & ~InsertDeleteFlags::FORMULA, NULL, pClipDoc, false ); + pDestDoc->CopyFromClip( aNewRange, aDestMark, InsertDeleteFlags::ALL & ~InsertDeleteFlags::FORMULA, nullptr, pClipDoc, false ); delete pClipDoc; return true; } ScFunctionAccess::ScFunctionAccess() : - pOptions( NULL ), + pOptions( nullptr ), aPropertyMap( ScDocOptionsHelper::GetPropertyMap() ), mbArray( true ), // default according to behaviour of older Office versions mbValid( true ) @@ -620,7 +620,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, // call GetMatrix before GetErrCode because GetMatrix always recalculates // if there is no matrix result - const ScMatrix* pMat = (mbArray && pFormula) ? pFormula->GetMatrix() : 0; + const ScMatrix* pMat = (mbArray && pFormula) ? pFormula->GetMatrix() : nullptr; sal_uInt16 nErrCode = pFormula ? pFormula->GetErrCode() : errIllegalArgument; if ( nErrCode == 0 ) { |