diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 09:13:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 09:46:16 +0100 |
| commit | 4523dd0544d762961435429167e41a0834b60cea (patch) | |
| tree | 56a642851053dbb73cc8e383ac29411382d6cc8b /editeng | |
| parent | 390ec50cbe3e0b8c15db6504b5bdd36dc3f3fb61 (diff) | |
Called C++ object pointer is null
Change-Id: I88efc4be6ff869ef97a2b398d43f7b7914debfc6
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/eertfpar.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 3662a4ceac48..006131ce6ce3 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -160,7 +160,7 @@ void EditRTFParser::AddRTFDefaultValues( const EditPaM& rStart, const EditPaM& r for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { ContentNode* pNode = mpEditEngine->GetEditDoc().GetObject( nPara ); - DBG_ASSERT( pNode, "AddRTFDefaultValues - No paragraph?!" ); + assert(pNode && "AddRTFDefaultValues - No paragraph?!"); if ( !pNode->GetContentAttribs().HasItem( EE_CHAR_FONTINFO ) ) pNode->GetContentAttribs().GetItems().Put( aFontItem ); if ( !pNode->GetContentAttribs().HasItem( EE_CHAR_FONTHEIGHT ) ) @@ -280,7 +280,7 @@ void EditRTFParser::SetEndPrevPara( SvxNodeIdx*& rpNodePos, if ( nCurPara ) nCurPara--; ContentNode* pPrevNode = mpEditEngine->GetEditDoc().GetObject( nCurPara ); - DBG_ASSERT( pPrevNode, "pPrevNode = 0!" ); + assert(pPrevNode && "pPrevNode = 0!"); rpNodePos = new EditNodeIdx(mpEditEngine, pPrevNode); rCntPos = pPrevNode->Len(); } diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 3140c16a22ab..ee1ae9f13857 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -711,7 +711,7 @@ void ImpEditEngine::TextModified() void ImpEditEngine::ParaAttribsChanged( ContentNode* pNode ) { - OSL_ENSURE( pNode, "ParaAttribsChanged: Which one?" ); + assert(pNode && "ParaAttribsChanged: Which one?"); aEditDoc.SetModified( true ); bFormatted = false; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index d717b1adbc34..f519fe8c9640 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4112,7 +4112,7 @@ EditPaM ImpEditEngine::InsertParagraph( sal_Int32 nPara ) ContentNode* pNode = GetEditDoc().GetObject( nPara-1 ); if ( !pNode ) pNode = GetEditDoc().GetObject( GetEditDoc().Count() - 1 ); - DBG_ASSERT( pNode, "Not a single paragraph in InsertParagraph ?" ); + assert(pNode && "Not a single paragraph in InsertParagraph ?"); aPaM = EditPaM( pNode, pNode->Len() ); } else |