diff options
Diffstat (limited to 'sw/source/filter/html/htmlfldw.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 177d39dc5d4b..1d2def315b93 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,7 +115,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, default: ; } - ASSERT( pSubStr, "ubekannter Subtyp fuer SwExtUserField" ); + OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwExtUserField" ); bFixed = ((const SwExtUserField*)pFld)->IsFixed(); break; @@ -125,7 +126,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break; case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_FF_shortcut; break; } - ASSERT( pFmtStr, "ubekanntes Format fuer SwAuthorField" ); + OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" ); bFixed = ((const SwAuthorField*)pFld)->IsFixed(); break; @@ -149,7 +150,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case PG_NEXT: pSubStr = OOO_STRING_SW_HTML_FS_next; break; case PG_PREV: pSubStr = OOO_STRING_SW_HTML_FS_prev; break; } - ASSERT( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" ); + OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" ); pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) ); if( (SvxExtNumType)nFmt==SVX_NUM_CHAR_SPECIAL ) @@ -216,7 +217,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, { // Fuer ein fixes Feld och den Num-Value ausgeben. // Fixe Felder ohne Zahlenformate sollte es - // eigentlich nicht geben. ASSERT ist unten. + // eigentlich nicht geben. OSL_ENSURE(ist unten. dNumValue = ((const SwDocInfoField*)pFld)->GetValue(); bNumValue = sal_True; } @@ -261,7 +262,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, ; } bFixed = ((const SwFileNameField*)pFld)->IsFixed(); - ASSERT( pFmtStr, "unbekanntes Format fuer SwFileNameField" ); + OSL_ENSURE( pFmtStr, "unbekanntes Format fuer SwFileNameField" ); break; } @@ -291,7 +292,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } if( bNumFmt ) { - ASSERT( nFmt, "Zahlenformat ist 0" ); + OSL_ENSURE( nFmt, "Zahlenformat ist 0" ); sOut = HTMLOutFuncs::CreateTableDataOptionsValNum( sOut, bNumValue, dNumValue, nFmt, *rHTMLWrt.pDoc->GetNumberFormatter(), @@ -528,7 +529,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) else { const SwTxtFld *pTxtFld = rFld.GetTxtFld(); - ASSERT( pTxtFld, "Where is the txt fld?" ); + OSL_ENSURE( pTxtFld, "Where is the txt fld?" ); if( pTxtFld ) OutHTML_SwField( rWrt, pFld, pTxtFld->GetTxtNode(), *pTxtFld->GetStart() ); @@ -537,3 +538,4 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |