diff options
Diffstat (limited to 'sw/source/core/doc/doctxm.cxx')
| -rw-r--r-- | sw/source/core/doc/doctxm.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index fb257de9cb..dfc587d3cb 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -181,10 +181,10 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark ) { // hole den TextNode und const SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark(); - ASSERT( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" ); + OSL_ENSURE( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" ); SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode()); - ASSERT( rTxtNd.GetpSwpHints(), "kann nicht geloescht werden" ); + OSL_ENSURE( rTxtNd.GetpSwpHints(), "kann nicht geloescht werden" ); if( DoesUndo() ) { @@ -242,7 +242,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, SwTOXSearch eDir, BOOL bInReadOnly ) { const SwTxtTOXMark* pMark = rCurTOXMark.GetTxtTOXMark(); - ASSERT(pMark, "pMark==0 Ungueltige TxtTOXMark"); + OSL_ENSURE(pMark, "pMark==0 Ungueltige TxtTOXMark"); const SwTxtNode *pTOXSrc = pMark->GetpTxtNd(); @@ -459,7 +459,7 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const SectionType eT = pSectNd->GetSection().GetType(); if( TOX_CONTENT_SECTION == eT ) { - ASSERT( pSectNd->GetSection().ISA( SwTOXBaseSection ), + OSL_ENSURE( pSectNd->GetSection().ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); SwTOXBaseSection& rTOXSect = (SwTOXBaseSection&) pSectNd->GetSection(); @@ -472,10 +472,10 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const { - ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" ); + OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" ); const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase; SwSectionFmt* pFmt = rTOXSect.GetFmt(); - ASSERT( pFmt, "invalid TOXBaseSection!" ); + OSL_ENSURE( pFmt, "invalid TOXBaseSection!" ); return pFmt->GetAttrSet(); } @@ -526,7 +526,7 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes ) { // its only delete the TOX, not the nodes BOOL bRet = FALSE; - ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); + OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase; SwSectionFmt* pFmt = rTOXSect.GetFmt(); @@ -697,7 +697,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName) { - ASSERT( rTOXBase.ISA( SwTOXBaseSection ), + OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOXBase; @@ -726,7 +726,7 @@ const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, BYTE nLvl = 0 ) { SwPosition aPos( *pNd ); pNd = GetBodyTxtNode( *pNd->GetDoc(), aPos, *pFrm ); - ASSERT( pNd, "wo steht der Absatz" ); + OSL_ENSURE( pNd, "wo steht der Absatz" ); } } return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0; @@ -1630,7 +1630,7 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx, // String mit dem Pattern aus der Form initialisieren const SwTOXSortTabBase& rBase = *aSortArr[nIndex]; USHORT nLvl = rBase.GetLevel(); - ASSERT( nLvl < GetTOXForm().GetFormMax(), "ungueltiges FORM_LEVEL"); + OSL_ENSURE( nLvl < GetTOXForm().GetFormMax(), "ungueltiges FORM_LEVEL"); SvxTabStopItem aTStops( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ); xub_StrLen nLinkStartPosition = STRING_NOTFOUND; @@ -1964,7 +1964,7 @@ void SwTOXBaseSection::UpdatePageNum() if( rTOXSource.pNd ) { SwCntntFrm* pFrm = rTOXSource.pNd->GetFrm(); - ASSERT( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found"); + OSL_ENSURE( pFrm || pDoc->IsUpdateTOX(), "TOX, no Frame found"); if( !pFrm ) continue; if( pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->HasFollow() ) @@ -2007,7 +2007,7 @@ void SwTOXBaseSection::UpdatePageNum() if(pBase->pTOXNd) { const SwTxtNode* pTxtNd = pBase->pTOXNd->GetTxtNode(); - ASSERT( pTxtNd, "kein TextNode, falsches Verzeichnis" ); + OSL_ENSURE( pTxtNd, "kein TextNode, falsches Verzeichnis" ); _UpdatePageNum( (SwTxtNode*)pTxtNd, aNums, aDescs, pMainNums, aIntl ); @@ -2277,7 +2277,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew) delete pNew; return; } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 else DBG_ERROR("Bibliography entries cannot be found here"); #endif @@ -2311,7 +2311,7 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin sToCompare.Erase( 0, 1 ).Insert( sUpper, 0 ); } - ASSERT(rRange.Min() >= 0 && rRange.Max() >= 0, "Min Max < 0"); + OSL_ENSURE(rRange.Min() >= 0 && rRange.Max() >= 0, "Min Max < 0"); const USHORT nMin = (USHORT)rRange.Min(); const USHORT nMax = (USHORT)rRange.Max(); |