From 11d20507806d30e2d1955b93a568b84a2216ef69 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Mar 2011 19:08:19 +0100 Subject: Move DBG_ERROR to OSL_FAIL --- svl/inc/svl/filerec.hxx | 2 +- svl/source/config/asiancfg.cxx | 2 +- svl/source/config/ctloptions.cxx | 2 +- svl/source/filepicker/pickerhelper.cxx | 4 ++-- svl/source/items/cenumitm.cxx | 4 ++-- svl/source/items/cintitem.cxx | 8 ++++---- svl/source/items/cntwall.cxx | 4 ++-- svl/source/items/ctypeitm.cxx | 2 +- svl/source/items/custritm.cxx | 4 ++-- svl/source/items/dateitem.cxx | 2 +- svl/source/items/globalnameitem.cxx | 2 +- svl/source/items/intitem.cxx | 2 +- svl/source/items/itempool.cxx | 6 +++--- svl/source/items/itemset.cxx | 6 +++--- svl/source/items/lckbitem.cxx | 2 +- svl/source/items/nranges.cxx | 2 +- svl/source/items/poolio.cxx | 2 +- svl/source/items/poolitem.cxx | 4 ++-- svl/source/items/ptitem.cxx | 4 ++-- svl/source/items/rectitem.cxx | 4 ++-- svl/source/items/slstitm.cxx | 2 +- svl/source/items/srchitem.cxx | 2 +- svl/source/items/style.cxx | 6 +++--- svl/source/items/szitem.cxx | 2 +- svl/source/items/visitem.cxx | 2 +- svl/source/misc/inettype.cxx | 2 +- svl/source/notify/brdcst.cxx | 2 +- svl/source/numbers/numfmuno.cxx | 16 ++++++++-------- svl/source/numbers/numhead.cxx | 8 ++++---- svl/source/numbers/supservs.cxx | 2 +- svl/source/numbers/zforfind.cxx | 2 +- svl/source/numbers/zforlist.cxx | 22 +++++++++++----------- svl/source/numbers/zformat.cxx | 6 +++--- svl/source/undo/undo.cxx | 8 ++++---- 34 files changed, 75 insertions(+), 75 deletions(-) (limited to 'svl') diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index a551caebb027..ca17a939fc60 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -621,7 +621,7 @@ public: // private: geht nicht, da einige Compiler dann auch vorherige privat machen void NewContent() - { DBG_ERROR( "NewContent() only allowed with args" ); } + { OSL_FAIL( "NewContent() only allowed with args" ); } }; //------------------------------------------------------------------------ diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx index efebd3a37836..2052a2f18d42 100644 --- a/svl/source/config/asiancfg.cxx +++ b/svl/source/config/asiancfg.cxx @@ -260,7 +260,7 @@ void SvxAsianConfig::SetStartEndChars( const Locale& rLocale, } #ifdef DBG_UTIL else if(!bFound) - DBG_ERROR("attempt to clear unavailable data"); + OSL_FAIL("attempt to clear unavailable data"); #endif SetModified(); } diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 14b95906ddd1..57f445d68e62 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -119,7 +119,7 @@ sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const case SvtCTLOptions::E_CTLTEXTNUMERALS : bReadOnly = m_bROCTLTextNumerals ; break; case SvtCTLOptions::E_CTLSEQUENCECHECKINGRESTRICTED: bReadOnly = m_bROCTLRestricted ; break; case SvtCTLOptions::E_CTLSEQUENCECHECKINGTYPEANDREPLACE: bReadOnly = m_bROCTLTypeAndReplace; break; - default: DBG_ERROR( "SvtCTLOptions_Impl::IsReadOnly() - invalid option" ); + default: OSL_FAIL( "SvtCTLOptions_Impl::IsReadOnly() - invalid option" ); } return bReadOnly; } diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx index 6b6bf96a54a6..b241ea95492e 100644 --- a/svl/source/filepicker/pickerhelper.cxx +++ b/svl/source/filepicker/pickerhelper.cxx @@ -67,7 +67,7 @@ namespace svt } catch( const css::uno::Exception& ) { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); + OSL_FAIL( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); } } @@ -93,7 +93,7 @@ namespace svt } catch( const css::uno::Exception& ) { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); + OSL_FAIL( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); } } } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index d6aefee3a99a..61128f3bce55 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -88,7 +88,7 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, SetEnumValue(USHORT(nTheValue)); return true; } - DBG_ERROR("SfxEnumItemInterface::PutValue(): Wrong type"); + OSL_FAIL("SfxEnumItemInterface::PutValue(): Wrong type"); return false; } @@ -248,7 +248,7 @@ bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE) m_bValue = bTheValue; return true; } - DBG_ERROR("CntBoolItem::PutValue(): Wrong type"); + OSL_FAIL("CntBoolItem::PutValue(): Wrong type"); return false; } diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index ae65534f7bf1..f74463a32a12 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -106,7 +106,7 @@ bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) return true; } - DBG_ERROR( "CntByteItem::PutValue - Wrong type!" ); + OSL_FAIL( "CntByteItem::PutValue - Wrong type!" ); return false; } @@ -242,7 +242,7 @@ bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) return true; } - DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" ); + OSL_FAIL( "CntUInt16Item::PutValue - Wrong type!" ); return false; } @@ -373,7 +373,7 @@ bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) return true; } - DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" ); + OSL_FAIL( "CntInt32Item::PutValue - Wrong type!" ); return false; } @@ -508,7 +508,7 @@ bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE) return true; } - DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" ); + OSL_FAIL( "CntUInt32Item::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 6df75aa4e8bd..06269f945315 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -153,7 +153,7 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const // virtual bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); return false; } @@ -161,7 +161,7 @@ bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const // virtual bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE ) { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); return false; } diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 64ba76515e06..bd1b04a6e1dd 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -247,7 +247,7 @@ bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) return true; } - DBG_ERROR( "CntContentTypeItem::PutValue - Wrong type!" ); + OSL_FAIL( "CntContentTypeItem::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index eae1882f873f..4d03130e03d3 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -61,7 +61,7 @@ int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const // virtual int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const { - DBG_ERROR("CntUnencodedStringItem::Compare(): No international"); + OSL_FAIL("CntUnencodedStringItem::Compare(): No international"); DBG_CHKTHIS(CntUnencodedStringItem, 0); DBG_ASSERT(rWith.ISA(CntUnencodedStringItem), "CntUnencodedStringItem::Compare(): Bad type"); @@ -125,7 +125,7 @@ bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal, m_aValue = UniString(aTheValue); return true; } - DBG_ERROR("CntUnencodedStringItem::PutValue(): Wrong type"); + OSL_FAIL("CntUnencodedStringItem::PutValue(): Wrong type"); return false; } diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index c61d64625ba0..83b86418545a 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -192,7 +192,7 @@ bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal, return true; } - DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" ); + OSL_FAIL( "SfxDateTimeItem::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 5bb2fd5c7231..2e4c53a9d3c3 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -98,7 +98,7 @@ bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) return true; } - DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" ); + OSL_FAIL( "SfxGlobalNameItem::PutValue - Wrong type!" ); return true; } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 7038d00f1e12..3c6f63abb638 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -130,7 +130,7 @@ bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE ) return true; } - DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" ); + OSL_FAIL( "SfxInt16Item::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 37fa6782cbb3..942c4385776c 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -458,7 +458,7 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool ) for( USHORT i = (*ppItemArr)->Count(); i; ++ppHtArr, --i ) if ( !(*ppHtArr) ) { - DBG_ERROR( "old secondary pool must be empty" ); + OSL_FAIL( "old secondary pool must be empty" ); bOK = FALSE; break; } @@ -757,7 +757,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, USHORT nWhich ) { if ( pSecondary ) return pSecondary->Put( rItem, nWhich ); - DBG_ERROR( "unknown Which-Id - cannot put item" ); + OSL_FAIL( "unknown Which-Id - cannot put item" ); } // SID oder nicht poolable (neue Definition)? @@ -886,7 +886,7 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem ) pSecondary->Remove( rItem ); return; } - DBG_ERROR( "unknown Which-Id - cannot remove item" ); + OSL_FAIL( "unknown Which-Id - cannot remove item" ); } // SID oder nicht poolable (neue Definition)? diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index ee7a230dc89d..c90560891588 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -725,7 +725,7 @@ void SfxItemSet::PutExtended break; default: - DBG_ERROR( "invalid Argument for eDontCareAs" ); + OSL_FAIL( "invalid Argument for eDontCareAs" ); } } else @@ -750,7 +750,7 @@ void SfxItemSet::PutExtended break; default: - DBG_ERROR( "invalid Argument for eDefaultAs" ); + OSL_FAIL( "invalid Argument for eDefaultAs" ); } } pPtr += 2; @@ -972,7 +972,7 @@ const SfxPoolItem* SfxItemSet::GetItem return pItem; // sonst Fehler melden - DBG_ERROR( "invalid argument type" ); + OSL_FAIL( "invalid argument type" ); } // kein Item gefunden oder falschen Typ gefunden diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 43a931fdacb7..93aa8fe7a2aa 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -157,7 +157,7 @@ bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) return true; } - DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" ); + OSL_FAIL( "SfxLockBytesItem::PutValue - Wrong type!" ); return true; } diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index b80830fb3cbb..c4cbd4fdb865 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -576,7 +576,7 @@ SfxNumRanges& SfxNumRanges::operator -= } // we should never be here - DBG_ERROR( "SfxNumRanges::operator-=: internal error" ); + OSL_FAIL( "SfxNumRanges::operator-=: internal error" ); } // while pTarget[ nTargetPos ] = 0; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 672bc25b1f98..81b1045ec970 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -1125,7 +1125,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate : 0; if ( !pItem ) { - DBG_ERROR( "can't resolve surrogate" ); + OSL_FAIL( "can't resolve surrogate" ); rWhich = 0; // nur zur Sicherheit fuer richtige Stream-Pos return 0; } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 83af20cf9b9e..c09e419781f0 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -424,7 +424,7 @@ bool SfxPoolItem::HasMetrics() const bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const { - DBG_ERROR("There is no implementation for QueryValue for this item!"); + OSL_FAIL("There is no implementation for QueryValue for this item!"); return false; } @@ -432,7 +432,7 @@ bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE ) { - DBG_ERROR("There is no implementation for PutValue for this item!"); + OSL_FAIL("There is no implementation for PutValue for this item!"); return false; } diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index fddb153d2ae2..3471f6eee0cf 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -156,7 +156,7 @@ bool SfxPointItem::QueryValue( uno::Any& rVal, case 0: rVal <<= aTmp; break; case MID_X: rVal <<= aTmp.X; break; case MID_Y: rVal <<= aTmp.Y; break; - default: DBG_ERROR("Wrong MemberId!"); return true; + default: OSL_FAIL("Wrong MemberId!"); return true; } return true; @@ -195,7 +195,7 @@ bool SfxPointItem::PutValue( const uno::Any& rVal, case 0: aVal.setX( aValue.X ); aVal.setY( aValue.Y ); break; case MID_X: aVal.setX( nVal ); break; case MID_Y: aVal.setY( nVal ); break; - default: DBG_ERROR("Wrong MemberId!"); return FALSE; + default: OSL_FAIL("Wrong MemberId!"); return FALSE; } } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 6383bafc70ce..bf3b865ef6d9 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -158,7 +158,7 @@ bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal, case MID_RECT_RIGHT: rVal <<= aVal.getY(); break; case MID_WIDTH: rVal <<= aVal.getWidth(); break; case MID_HEIGHT: rVal <<= aVal.getHeight(); break; - default: DBG_ERROR("Wrong MemberID!"); return false; + default: OSL_FAIL("Wrong MemberID!"); return false; } return true; @@ -191,7 +191,7 @@ bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal, case MID_RECT_RIGHT: aVal.setY( nVal ); break; case MID_WIDTH: aVal.setWidth( nVal ); break; case MID_HEIGHT: aVal.setHeight( nVal ); break; - default: DBG_ERROR("Wrong MemberID!"); return false; + default: OSL_FAIL("Wrong MemberID!"); return false; } } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 8177b35b600c..392f986f942f 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -403,7 +403,7 @@ bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE ) return true; } - DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" ); + OSL_FAIL( "SfxStringListItem::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index d332ee3df467..b7e162511fb9 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -661,7 +661,7 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember break; } default: - DBG_ERROR( "Unknown MemberId" ); + OSL_FAIL( "Unknown MemberId" ); } return bRet; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index e40c1c449e42..243ab85019a0 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -279,7 +279,7 @@ BOOL SfxStyleSheetBase::SetParent( const XubString& rName ) SfxStyleSheetBase* pIter = rPool.Find(rName, nFamily); if( rName.Len() && !pIter ) { - DBG_ERROR( "StyleSheet-Parent nicht gefunden" ); + OSL_FAIL( "StyleSheet-Parent nicht gefunden" ); return FALSE; } // rekursive Verknuepfungen verhindern @@ -309,7 +309,7 @@ BOOL SfxStyleSheetBase::SetFollow( const XubString& rName ) { if( !rPool.Find( rName, nFamily ) ) { - DBG_ERROR( "StyleSheet-Follow nicht gefunden" ); + OSL_FAIL( "StyleSheet-Follow nicht gefunden" ); return FALSE; } aFollow = rName; @@ -484,7 +484,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::operator[](USHORT nIdx) ++z; } } - DBG_ERROR("falscher Index"); + OSL_FAIL("falscher Index"); return 0; } diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index c3dc10a918ee..6ed1a30941ae 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -160,7 +160,7 @@ bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal, rVal <<= aTmp.getWidth(); break; case MID_HEIGHT: rVal <<= aTmp.getHeight(); break; - default: DBG_ERROR("Wrong MemberId!"); return false; + default: OSL_FAIL("Wrong MemberId!"); return false; } return true; diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 97e762773f2a..67df8fc78d63 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -99,7 +99,7 @@ bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE) if (rVal >>= m_nValue) return true; - DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" ); + OSL_FAIL( "SfxInt16Item::PutValue - Wrong type!" ); return false; } diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index 025fb95dd71d..744a26a55eff 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -936,7 +936,7 @@ UniString INetContentTypes::GetContentType(INetContentType eTypeID) Registration::GetContentType(eTypeID); if (aTypeName.Len() == 0) { - DBG_ERROR("INetContentTypes::GetContentType(): Bad ID"); + OSL_FAIL("INetContentTypes::GetContentType(): Bad ID"); return UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( CONTENT_TYPE_STR_APP_OCTSTREAM)); diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 82462a57f430..a86b7f49f586 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -147,7 +147,7 @@ BOOL SfxBroadcaster::AddListener( SfxListener& rListener ) aListeners.Insert( pListener, aListeners.Count() ); else { - DBG_ERROR( "array overflow" ); + OSL_FAIL( "array overflow" ); return FALSE; } diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 4142bca372e2..fa7d47267ba7 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -849,7 +849,7 @@ void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const rtl::OUString&, @@ -857,7 +857,7 @@ void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const rtl::OUStri throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const rtl::OUString&, @@ -865,7 +865,7 @@ void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const rtl::OUString& throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const rtl::OUString&, @@ -873,7 +873,7 @@ void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const rtl::OUStri throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } // XPropertyAccess @@ -1086,7 +1086,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const rtl::O throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const rtl::OUString&, @@ -1094,7 +1094,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const rtl throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const rtl::OUString&, @@ -1102,7 +1102,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const rtl::O throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl::OUString&, @@ -1110,7 +1110,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const rtl throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } // XServiceInfo diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index ac91f2978e24..d2274f8d5051 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -69,7 +69,7 @@ ULONG SvNumReadHeader::BytesLeft() const if (nReadEnd <= nDataEnd) return nDataEnd-nReadEnd; - DBG_ERROR("Fehler bei SvNumReadHeader::BytesLeft"); + OSL_FAIL("Fehler bei SvNumReadHeader::BytesLeft"); return 0; } @@ -119,7 +119,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) : rStream >> nID; if (nID != SV_NUMID_SIZES) { - DBG_ERROR("SV_NUMID_SIZES nicht gefunden"); + OSL_FAIL("SV_NUMID_SIZES nicht gefunden"); } sal_uInt32 nSizeTableLen; rStream >> nSizeTableLen; @@ -154,7 +154,7 @@ void ImpSvNumMultipleReadHeader::Skip( SvStream& rStream ) rStream >> nID; if ( nID != SV_NUMID_SIZES ) { - DBG_ERROR("SV_NUMID_SIZES nicht gefunden"); + OSL_FAIL("SV_NUMID_SIZES nicht gefunden"); } sal_uInt32 nSizeTableLen; rStream >> nSizeTableLen; @@ -190,7 +190,7 @@ ULONG ImpSvNumMultipleReadHeader::BytesLeft() const if (nReadEnd <= nEntryEnd) return nEntryEnd-nReadEnd; - DBG_ERROR("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft"); + OSL_FAIL("Fehler bei ImpSvNumMultipleReadHeader::BytesLeft"); return 0; } diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 3f5eb9aa1582..e3236c309bf4 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -117,7 +117,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< #ifdef DBG_UTIL else { - DBG_ERROR("SvNumberFormatsSupplierServiceObject::initialize : unknown argument !"); + OSL_FAIL("SvNumberFormatsSupplierServiceObject::initialize : unknown argument !"); } #endif } diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 0fac0d849c52..12c92538d2be 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1022,7 +1022,7 @@ BOOL ImpSvNumberInputScan::GetDateRef( double& fDays, USHORT& nCounter, } break; default: - DBG_ERROR( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" ); + OSL_FAIL( "ImpSvNumberInputScan::GetDateRef: unknown NfEvalDateFormat" ); DateFmt = YMD; bFormatTurn = FALSE; } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 432c6cd11e47..1cdc860f971a 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -526,7 +526,7 @@ BOOL SvNumberFormatter::PutEntry(String& rString, sal_uInt32 nPos = CLOffset + pStdFormat->GetLastInsertKey(); if (nPos - CLOffset >= SV_COUNTRY_LANGUAGE_OFFSET) { - DBG_ERROR("SvNumberFormatter:: Zu viele Formate pro CL"); + OSL_FAIL("SvNumberFormatter:: Zu viele Formate pro CL"); delete p_Entry; } else if (!aFTable.Insert(nPos+1,p_Entry)) @@ -966,7 +966,7 @@ String SvNumberFormatter::GetKeyword( LanguageType eLnge, USHORT nIndex ) if ( pTable && nIndex < NF_KEYWORD_ENTRIES_COUNT ) return pTable[nIndex]; - DBG_ERROR("GetKeyword: invalid index"); + OSL_FAIL("GetKeyword: invalid index"); return String(); } @@ -1050,7 +1050,7 @@ SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable( SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(FIndex); if (!pFormat) { -// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)"); +// OSL_FAIL("SvNumberFormatter:: Unbekanntes altes Zahlformat (1)"); rLnge = IniLnge; eType = NUMBERFORMAT_ALL; eTypetmp = eType; @@ -1207,7 +1207,7 @@ BOOL SvNumberFormatter::IsNumberFormat(const String& sString, const SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index); if (!pFormat) { -// DBG_ERROR("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)"); +// OSL_FAIL("SvNumberFormatter:: Unbekanntes altes Zahlformat (2)"); ChangeIntl(IniLnge); FType = NUMBERFORMAT_NUMBER; } @@ -2964,7 +2964,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter nNewKey = nPos+1; if (nPos - nCLOffset >= SV_COUNTRY_LANGUAGE_OFFSET) { - DBG_ERROR( + OSL_FAIL( "SvNumberFormatter:: Zu viele Formate pro CL"); delete pNewEntry; } @@ -4017,7 +4017,7 @@ void NfCurrencyEntry::CompletePositiveFormatString( String& rStr, } break; default: - DBG_ERROR("NfCurrencyEntry::CompletePositiveFormatString: unknown option"); + OSL_FAIL("NfCurrencyEntry::CompletePositiveFormatString: unknown option"); break; } } @@ -4139,7 +4139,7 @@ void NfCurrencyEntry::CompleteNegativeFormatString( String& rStr, } break; default: - DBG_ERROR("NfCurrencyEntry::CompleteNegativeFormatString: unknown option"); + OSL_FAIL("NfCurrencyEntry::CompleteNegativeFormatString: unknown option"); break; } } @@ -4170,7 +4170,7 @@ USHORT NfCurrencyEntry::GetEffectivePositiveFormat( USHORT case 3: // 1 $ break; default: - DBG_ERROR("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option"); + OSL_FAIL("NfCurrencyEntry::GetEffectivePositiveFormat: unknown option"); break; } return nIntlFormat; @@ -4211,7 +4211,7 @@ USHORT lcl_MergeNegativeParenthesisFormat( USHORT nIntlFormat, USHORT nCurrForma nSign = 2; break; default: - DBG_ERROR("lcl_MergeNegativeParenthesisFormat: unknown option"); + OSL_FAIL("lcl_MergeNegativeParenthesisFormat: unknown option"); break; } @@ -4324,7 +4324,7 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat, nIntlFormat = 8; // -1 $ break; default: - DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); break; } #endif @@ -4386,7 +4386,7 @@ USHORT NfCurrencyEntry::GetEffectiveNegativeFormat( USHORT nIntlFormat, nIntlFormat, nCurrFormat ); break; default: - DBG_ERROR("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); + OSL_FAIL("NfCurrencyEntry::GetEffectiveNegativeFormat: unknown option"); break; } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index e44af299038a..0004cad52d5c 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -2299,7 +2299,7 @@ BOOL SvNumberformat::GetOutputString(double fNumber, } if (rInfo.nCntExp == 0) { - DBG_ERROR("SvNumberformat:: Bruch, nCntExp == 0"); + OSL_FAIL("SvNumberformat:: Bruch, nCntExp == 0"); return FALSE; } ULONG nBasis = ((ULONG)floor( // 9, 99, 999 ,... @@ -4144,7 +4144,7 @@ DateFormat SvNumberformat::GetDateOrder() const } else { - DBG_ERROR( "SvNumberformat::GetDateOrder: no date" ); + OSL_FAIL( "SvNumberformat::GetDateOrder: no date" ); } return rLoc().getDateFormat(); } @@ -4154,7 +4154,7 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const sal_uInt32 nRet = 0; if ( (eType & NUMBERFORMAT_DATE) != NUMBERFORMAT_DATE ) { - DBG_ERROR( "SvNumberformat::GetExactDateOrder: no date" ); + OSL_FAIL( "SvNumberformat::GetExactDateOrder: no date" ); return nRet; } short const * const pType = NumFor[0].Info().nTypeArray; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 8e77cde327da..7176dd894d0e 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -122,7 +122,7 @@ XubString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const void SfxUndoAction::Undo() { // die sind nur konzeptuell pure virtual - DBG_ERROR( "pure virtual function called: SfxUndoAction::Undo()" ); + OSL_FAIL( "pure virtual function called: SfxUndoAction::Undo()" ); } //------------------------------------------------------------------------ @@ -130,7 +130,7 @@ void SfxUndoAction::Undo() void SfxUndoAction::Redo() { // die sind nur konzeptuell pure virtual - DBG_ERROR( "pure virtual function called: SfxUndoAction::Redo()" ); + OSL_FAIL( "pure virtual function called: SfxUndoAction::Redo()" ); } //------------------------------------------------------------------------ @@ -138,7 +138,7 @@ void SfxUndoAction::Redo() void SfxUndoAction::Repeat(SfxRepeatTarget&) { // die sind nur konzeptuell pure virtual - DBG_ERROR( "pure virtual function called: SfxUndoAction::Repeat()" ); + OSL_FAIL( "pure virtual function called: SfxUndoAction::Repeat()" ); } //------------------------------------------------------------------------ @@ -585,7 +585,7 @@ void SfxUndoManager::LeaveListAction() if( pActUndoArray == pUndoArray ) { - DBG_ERROR( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" ); + OSL_FAIL( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" ); return; } -- cgit