diff options
| -rw-r--r-- | svl/source/items/itemset.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/text/itratr.cxx | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 24fc38145b66..cf15b267b5a9 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1254,13 +1254,11 @@ default unknown != sal_True - - - dontcare unknown != sal_True - - - unknown unknown != sal_True - - - */ - - static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount, const SfxPoolItem **ppFnd1, const SfxPoolItem *pFnd2, bool bIgnoreDefaults ) { - DBG_ASSERT( ppFnd1 != 0, "Merging to 0-Item" ); + assert(ppFnd1 != 0 && "Merging to 0-Item"); // 1. Item ist default? if ( !*ppFnd1 ) @@ -1321,8 +1319,6 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount, } } - - void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults ) { // Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen! diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index e80b179b1b44..161e8aa38cd9 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -482,7 +482,7 @@ void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin) void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin) { - DBG_ASSERT(pOldWin, "SdrPaintView::DeleteWindowFromPaintView: No OutputDevice(!)"); + assert(pOldWin && "SdrPaintView::DeleteWindowFromPaintView: No OutputDevice(!)"); SdrPaintWindow* pCandidate = FindPaintWindow(*pOldWin); if(pCandidate) diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ec985559728a..b8bc0b44b88c 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -1471,7 +1471,7 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ); static void lcl_DelLine( SwTableLine* pLine, _DelTabPara* pPara ) { - OSL_ENSURE( pPara, "The parameters are missing!" ); + assert(pPara && "The parameters are missing!"); _DelTabPara aPara( *pPara ); for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin(); it != pLine->GetTabBoxes().end(); ++it) @@ -1483,7 +1483,7 @@ static void lcl_DelLine( SwTableLine* pLine, _DelTabPara* pPara ) static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara ) { - OSL_ENSURE( pDelPara, "The parameters are missing" ); + assert(pDelPara && "The parameters are missing"); // Delete the Box's Lines if( !pBox->GetTabLines().empty() ) diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index f4212b6fdc0e..9b9074d57b95 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; void SwAttrIter::Chg( SwTxtAttr *pHt ) { - OSL_ENSURE( pHt && pFnt, "No attribute of font available for change"); + assert(pHt && pFnt && "No attribute of font available for change"); if( pRedln && pRedln->IsOn() ) pRedln->ChangeTxtAttr( pFnt, *pHt, true ); else @@ -71,7 +71,7 @@ void SwAttrIter::Chg( SwTxtAttr *pHt ) void SwAttrIter::Rst( SwTxtAttr *pHt ) { - OSL_ENSURE( pHt && pFnt, "No attribute of font available for reset"); + assert(pHt && pFnt && "No attribute of font available for reset"); // get top from stack after removing pHt if( pRedln && pRedln->IsOn() ) pRedln->ChangeTxtAttr( pFnt, *pHt, false ); |