diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-19 12:22:03 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-19 13:08:29 +0200 |
commit | c8479bdc5b007ca5ffe1d553be3d90fb03424526 (patch) | |
tree | f927ba8085da8c9dc46d1cda669fbac8af724abf /editeng | |
parent | 39e63bfac528d8c5c002ee8fef4a1e5d7181b826 (diff) |
convert DBG_ASSERTWARNING to SAL_WARN_IF
I know the comment in debug.hxx said to use SAL_INFO, but SAL_WARN makes
much more sense.
Change-Id: I3d81f9db89ef8cebe1e4f2983941d69b4c7e6b7d
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 610e7545173f..03bbcd3afcb5 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -631,7 +631,7 @@ void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 /* nEnd */ ) sal_Int32 ParaPortion::GetLineNumber( sal_Int32 nIndex ) const { - DBG_ASSERTWARNING( aLineList.Count(), "Empty ParaPortion in GetLine!" ); + SAL_WARN_IF( !aLineList.Count(), "editeng", "Empty ParaPortion in GetLine!" ); DBG_ASSERT( bVisible, "Why GetLine() on an invisible paragraph?" ); for ( sal_Int32 nLine = 0; nLine < aLineList.Count(); nLine++ ) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index f137bb4c809e..30ea23ba3253 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1647,7 +1647,7 @@ void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj { if ( nPara > GetParagraphCount() ) { - DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); nPara = GetParagraphCount(); } @@ -1669,7 +1669,7 @@ void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt) { if ( nPara > GetParagraphCount() ) { - DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); nPara = GetParagraphCount(); } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 4b41e79983bb..aeb8a6841528 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -994,7 +994,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck ) Rectangle aR( aOutArea ); aR = pOutWin->LogicToPixel( aR ); aR = pOutWin->PixelToLogic( aR ); - DBG_ASSERTWARNING( aR == aOutArea, "OutArea before Scroll not aligned" ); + SAL_WARN_IF( aR != aOutArea, "editeng", "OutArea before Scroll not aligned" ); #endif Rectangle aNewVisArea( GetVisDocArea() ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 3fa08b4ff458..7138dd8d3f04 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4179,7 +4179,7 @@ EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 nPara ) { EditSelection* pSel = 0; ContentNode* pNode = GetEditDoc().GetObject( nPara ); - DBG_ASSERTWARNING( pNode, "Paragraph does not exist: SelectParagraph" ); + SAL_WARN_IF( !pNode, "editeng", "Paragraph does not exist: SelectParagraph" ); if ( pNode ) pSel = new EditSelection( EditPaM( pNode, 0 ), EditPaM( pNode, pNode->Len() ) ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 39e754b7c631..5cda516a3b62 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1476,7 +1476,7 @@ SpellInfo * ImpEditEngine::CreateSpellInfo( bool bMultipleDocs ) EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc ) { - DBG_ASSERTWARNING( xSpeller.is(), "No Spell checker set!" ); + SAL_WARN_IF( !xSpeller.is(), "editeng", "No Spell checker set!" ); if ( !xSpeller.is() ) return EE_SPELL_NOSPELLER; |