diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-11-25 17:08:45 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-11-25 17:12:34 +0100 |
| commit | c16ba8a04fd4599e439e7e039705e41691c43acb (patch) | |
| tree | 66a1c67973a674245548e10ff0746d1e473a7703 /sw/source/core/txtnode/atrfld.cxx | |
| parent | e9eaf033646695987e218907a565b555b976c5c8 (diff) | |
Removed DBG_UTIL from sw
* Fixed the different dbglevel builds
* This needed to change all the sw local ASSERT to OSL_ENSURE...
Diffstat (limited to 'sw/source/core/txtnode/atrfld.cxx')
| -rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index bedc79b1db86..843705204a21 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -139,7 +139,7 @@ void SwFmtFld::SetFld(SwField * _pField) int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const { - ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); // OD 2004-05-14 #i29146# - correction: check, if <pField> and // <((SwFmtFld&)rAttr).GetFld()> are set. // OD 2004-05-14 #i29146# - items are equal, if both fields aren't set. @@ -164,7 +164,7 @@ void SwFmtFld::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) return; SwTxtNode* pTxtNd = (SwTxtNode*)&pTxtAttr->GetTxtNode(); - ASSERT( pTxtNd, "wo ist denn mein Node?" ); + OSL_ENSURE( pTxtNd, "wo ist denn mein Node?" ); if( pNew ) { switch( pNew->Which() ) @@ -292,7 +292,7 @@ SwTxtFld::~SwTxtFld( ) void SwTxtFld::Expand() const { // Wenn das expandierte Feld sich nicht veraendert hat, wird returnt - ASSERT( m_pTxtNode, "SwTxtFld: where is my TxtNode?" ); + OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" ); const SwField* pFld = GetFld().GetFld(); XubString aNewExpand( @@ -334,8 +334,8 @@ void SwTxtFld::Expand() const void SwTxtFld::CopyFld( SwTxtFld *pDest ) const { - ASSERT( m_pTxtNode, "SwTxtFld: where is my TxtNode?" ); - ASSERT( pDest->m_pTxtNode, "SwTxtFld: where is pDest's TxtNode?" ); + OSL_ENSURE( m_pTxtNode, "SwTxtFld: where is my TxtNode?" ); + OSL_ENSURE( pDest->m_pTxtNode, "SwTxtFld: where is pDest's TxtNode?" ); IDocumentFieldsAccess* pIDFA = m_pTxtNode->getIDocumentFieldsAccess(); IDocumentFieldsAccess* pDestIDFA = pDest->m_pTxtNode->getIDocumentFieldsAccess(); @@ -364,7 +364,7 @@ void SwTxtFld::CopyFld( SwTxtFld *pDest ) const ((SwDDEFieldType*)pFldType)->IncRefCnt(); } - ASSERT( pFldType, "unbekannter FieldType" ); + OSL_ENSURE( pFldType, "unbekannter FieldType" ); pFldType->Add( &rFmtFld ); // ummelden rFmtFld.GetFld()->ChgTyp( pFldType ); } |