diff options
Diffstat (limited to 'sw/source/core/fields/fldbas.cxx')
| -rw-r--r-- | sw/source/core/fields/fldbas.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 39940c709f..761f3a53ff 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -159,7 +159,7 @@ SwFieldType::SwFieldType( USHORT nWhichId ) DBG_CTOR( SwFieldType, 0 ); } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 SwFieldType::~SwFieldType() { @@ -193,7 +193,7 @@ SwField::SwField(SwFieldType* pTyp, sal_uInt32 nFmt, USHORT nLng) : bIsAutomaticLanguage(TRUE), nFormat(nFmt) { - ASSERT( pTyp, "SwField: ungueltiger SwFieldType" ); + OSL_ENSURE( pTyp, "SwField: ungueltiger SwFieldType" ); pType = pTyp; } @@ -205,10 +205,10 @@ SwField::~SwField() Beschreibung: Statt Umweg ueber den Typ --------------------------------------------------------------------*/ -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 USHORT SwField::Which() const { - ASSERT(pType, "Kein Typ vorhanden"); + OSL_ENSURE(pType, "Kein Typ vorhanden"); return pType->Which(); } #endif @@ -312,13 +312,13 @@ void SwField::SetPar2(const String& ) USHORT SwField::GetSubType() const { -// ASSERT(0, "Sorry Not implemented"); +// OSL_ENSURE(0, "Sorry Not implemented"); return 0; } void SwField::SetSubType(USHORT ) { -// ASSERT(0, "Sorry Not implemented"); +// OSL_ENSURE(0, "Sorry Not implemented"); } bool SwField::QueryValue( uno::Any& rVal, USHORT nWhichId ) const @@ -362,7 +362,7 @@ bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId ) SwFieldType* SwField::ChgTyp( SwFieldType* pNewType ) { - ASSERT( pNewType && pNewType->Which() == pType->Which(), + OSL_ENSURE( pNewType && pNewType->Which() == pType->Which(), "kein Typ oder ungleiche Typen" ); SwFieldType* pOld = pType; @@ -459,7 +459,7 @@ String FormatNumber(USHORT nNum, sal_uInt32 nFormat) return String::CreateFromInt32( nNum ); SvxNumberType aNumber; - ASSERT(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" ); + OSL_ENSURE(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" ); aNumber.SetNumberingType((sal_Int16)nFormat); return aNumber.GetNumStr(nNum); @@ -523,7 +523,7 @@ String SwValueFieldType::ExpandValue( const double& rVal, else nFmt = nNewFormat; } - ASSERT(pEntry, "Unbekanntes Zahlenformat!"); + OSL_ENSURE(pEntry, "Unbekanntes Zahlenformat!"); } if( pFormatter->IsTextFormat( nFmt ) ) @@ -686,7 +686,7 @@ void SwValueField::SetLanguage( USHORT nLng ) } SetFormat( nNewFormat ); } - ASSERT(pEntry, "Unbekanntes Zahlenformat!"); + OSL_ENSURE(pEntry, "Unbekanntes Zahlenformat!"); } } |