diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 19:08:19 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 14:46:42 +0100 |
| commit | 11d20507806d30e2d1955b93a568b84a2216ef69 (patch) | |
| tree | b34fa3afac27eac9404f16e46b530aa2cbcad41d | |
| parent | 7b981b7cab15e0fc2ebb159df2d40c3a2499b265 (diff) | |
Move DBG_ERROR to OSL_FAIL
162 files changed, 396 insertions, 396 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 3766e1b2d31b..49da12816757 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -147,7 +147,7 @@ static float GetSwapFloat( SvStream& rSt ) { if ( sizeof( float ) != 4 ) { - DBG_ERROR( "EnhWMFReader::sizeof( float ) != 4" ); + OSL_FAIL( "EnhWMFReader::sizeof( float ) != 4" ); rXForm = XForm(); } else diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index d327bf077096..b510a0618137 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -136,7 +136,7 @@ SotFactory::SotFactory( const SvGlobalName & rName, DBG_ASSERT( aEmptyName != *this, "create factory without SvGlobalName" ); if( Find( *this ) ) { - DBG_ERROR( "create factories with the same unique name" ); + OSL_FAIL( "create factories with the same unique name" ); } } #endif diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index ae371eb24bea..5bd4af29a45b 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -459,7 +459,7 @@ void SotObject::RemoveOwnerLock() ReleaseRef(); } else { - DBG_ERROR("OwnerLockCount underflow!"); + OSL_FAIL("OwnerLockCount underflow!"); } } diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 2af1da460d9b..ef2384e77ea8 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -560,7 +560,7 @@ void Storage::FillInfoList( SvStorageInfoList* pList ) const BaseStorage* Storage::OpenUCBStorage( const String& rName, StreamMode m, BOOL bDirect ) { - DBG_ERROR("Not supported!"); + OSL_FAIL("Not supported!"); /* BaseStorage* pStorage = new Storage( pIo, NULL, m ); SetError( ERRCODE_IO_NOTSUPPORTED ); diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index a78ef489113d..6b5972e4ef98 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -383,7 +383,7 @@ ULONG StgIo::ValidateFATs() // DBG_ASSERT( nErr == FAT_OK ,"Storage kaputt"); return nErr; } -// DBG_ERROR("Validiere nicht (kein FileStorage)"); +// OSL_FAIL("Validiere nicht (kein FileStorage)"); return FAT_OK; } diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 7ea7373c9856..1764d3c7bdec 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -390,7 +390,7 @@ BOOL SotStorageStream::SetProperty( const String& rName, const ::com::sun::star: } else { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); return FALSE; } } @@ -404,7 +404,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno:: } else { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); return FALSE; } } @@ -418,7 +418,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno:: } else { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); return ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >(); } } @@ -739,7 +739,7 @@ void SotStorage::RemoveUNOStorageHolder( UNOStorageHolder* pHolder ) } else { - DBG_ERROR("Not implemented!"); + OSL_FAIL("Not implemented!"); } } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 9dd4af022a1b..0d0163f20252 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -359,7 +359,7 @@ sal_Int32 GetFormatId_Impl( SvGlobalName aName ) return 0; else { - DBG_ERROR( "Unknown UCB storage format!" ); + OSL_FAIL( "Unknown UCB storage format!" ); return 0; } } @@ -612,7 +612,7 @@ String UCBStorageElement_Impl::GetContentType() return m_xStorage->m_aContentType; else { - DBG_ERROR("Element not loaded!"); + OSL_FAIL("Element not loaded!"); return String(); } } @@ -626,7 +626,7 @@ void UCBStorageElement_Impl::SetContentType( const String& rType ) m_xStorage->m_aContentType = m_xStorage->m_aOriginalContentType = rType; } else { - DBG_ERROR("Element not loaded!"); + OSL_FAIL("Element not loaded!"); } } @@ -738,7 +738,7 @@ Reference<XInputStream> UCBStorageStream_Impl::GetXInputStream() if( m_pAntiImpl && m_nRepresentMode != nonset ) { - DBG_ERROR( "Misuse of the XInputstream!" ); + OSL_FAIL( "Misuse of the XInputstream!" ); SetError( ERRCODE_IO_ACCESSDENIED ); } else @@ -792,7 +792,7 @@ BOOL UCBStorageStream_Impl::Init() { if( m_nRepresentMode == xinputstream ) { - DBG_ERROR( "XInputStream misuse!" ); + OSL_FAIL( "XInputStream misuse!" ); SetError( ERRCODE_IO_ACCESSDENIED ); return FALSE; } @@ -814,7 +814,7 @@ BOOL UCBStorageStream_Impl::Init() if( !m_pStream ) { - DBG_ERROR( "Suspicious temporary stream creation!" ); + OSL_FAIL( "Suspicious temporary stream creation!" ); SetError( SVSTREAM_CANNOT_MAKE ); return FALSE; } @@ -853,7 +853,7 @@ BOOL UCBStorageStream_Impl::Init() { // something is really wrong m_bSourceRead = FALSE; - DBG_ERROR( "Can not operate original stream!" ); + OSL_FAIL( "Can not operate original stream!" ); SetError( SVSTREAM_CANNOT_MAKE ); } @@ -1244,7 +1244,7 @@ BOOL UCBStorageStream_Impl::Revert() // if an OLEStorage is created on this stream, no "revert" is neccessary because OLEStorages do nothing on "Revert" ! if ( m_bCommited ) { - DBG_ERROR("Revert while commit is in progress!" ); + OSL_FAIL("Revert while commit is in progress!" ); return FALSE; // ??? } @@ -1392,7 +1392,7 @@ ULONG UCBStorageStream::Write( const void* pData, ULONG nSize ) // mba: does occur in writer ! if ( pImp->m_bCommited ) { - DBG_ERROR("Writing while commit is in progress!" ); + OSL_FAIL("Writing while commit is in progress!" ); return 0; } */ @@ -1425,7 +1425,7 @@ BOOL UCBStorageStream::SetSize( ULONG nNewSize ) /* if ( pImp->m_bCommited ) { - DBG_ERROR("Changing stream size while commit is in progress!" ); + OSL_FAIL("Changing stream size while commit is in progress!" ); return FALSE; } */ @@ -2665,7 +2665,7 @@ ULONG UCBStorage::GetFormat() String UCBStorage::GetUserName() { - DBG_ERROR("UserName is not implemented in UCB storages!" ); + OSL_FAIL("UserName is not implemented in UCB storages!" ); return pImp->m_aUserTypeName; } @@ -2888,7 +2888,7 @@ BaseStorageStream* UCBStorage::OpenStream( const String& rEleName, StreamMode nM // stream has already been created; if it has no external reference, it may be opened another time if ( pElement->m_xStream->m_pAntiImpl ) { - DBG_ERROR("Stream is already open!" ); + OSL_FAIL("Stream is already open!" ); SetError( SVSTREAM_ACCESS_DENIED ); // ??? return NULL; } @@ -3011,7 +3011,7 @@ BaseStorage* UCBStorage::OpenStorage_Impl( const String& rEleName, StreamMode nM // storage has already been opened; if it has no external reference, it may be opened another time if ( pElement->m_xStorage->m_pAntiImpl ) { - DBG_ERROR("Storage is already open!" ); + OSL_FAIL("Storage is already open!" ); SetError( SVSTREAM_ACCESS_DENIED ); // ??? } else 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; } diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index e7c3c2b1b0bf..03fc750bbe82 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -952,7 +952,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL // prepare row ULONG nRow = nTopRow+nRelRow; if ( !SeekRow( nRow) ) { - DBG_ERROR("BrowseBox::ImplPaintData: SeekRow gescheitert"); + OSL_FAIL("BrowseBox::ImplPaintData: SeekRow gescheitert"); } _rOut.SetClipRegion(); aPos.X() = aOverallAreaPos.X(); @@ -994,7 +994,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL if (!pCol) { // FS - 21.05.99 - 66325 // ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ... - DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !"); + OSL_FAIL("BrowseBox::PaintData : nFirstCol is probably invalid !"); break; } } @@ -1267,7 +1267,7 @@ void BrowseBox::UpdateScrollbars() if ( nTopRow > nRowCount ) { nTopRow = nRowCount - 1; - DBG_ERROR("BrowseBox: nTopRow > nRowCount"); + OSL_FAIL("BrowseBox: nTopRow > nRowCount"); } if ( pVScroll->GetThumbPos() != nTopRow ) diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 9561fc533f76..cad6edab0ba4 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -550,12 +550,12 @@ void SvtAccessibilityOptions::Commit() sal_Bool SvtAccessibilityOptions::GetIsForDrawings() const { - DBG_ERROR( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" ); + OSL_FAIL( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" ); return sal_False; } sal_Bool SvtAccessibilityOptions::GetIsForBorders() const { - DBG_ERROR( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" ); + OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" ); return sal_False; } sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 2032d0a49afd..fb3f11060adf 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2221,7 +2221,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pEntry, c return Rectangle( aPos, aImageSize ); default: - DBG_ERROR("IconView: Viewmode not set"); + OSL_FAIL("IconView: Viewmode not set"); return aBound; } } @@ -3784,7 +3784,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( ULONG& rP pEntry = pEntry->pflink; if( nCount && pEntry == pHead ) { - DBG_ERROR("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!"); + OSL_FAIL("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!"); return 0; } } diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 793128ffe59e..3ad775fd071f 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -1310,7 +1310,7 @@ void SvImpIconView::PaintResizeRect( const Rectangle& rRect ) void SvImpIconView::RepaintSelectionItems() { - DBG_ERROR("RepaintSelectionItems"); + OSL_FAIL("RepaintSelectionItems"); pView->Invalidate(); // vorlaeufig } diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index c2d552b27b7d..67b20b3108c5 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -1172,7 +1172,7 @@ SvLBox* SvLBox::GetTargetView() const void SvLBox::RequestingChilds( SvLBoxEntry* ) { DBG_CHKTHIS(SvLBox,0); - DBG_ERROR("Child-Request-Hdl not implemented!"); + OSL_FAIL("Child-Request-Hdl not implemented!"); } void SvLBox::RecalcViewData() diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index fb4510467c14..7bb25e9c065e 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -810,7 +810,7 @@ ULONG SvTreeList::GetVisibleCount( const SvListView* pView ) const #ifdef DBG_UTIL if( nPos > 10000000 ) { - DBG_ERROR("nVisibleCount bad"); + OSL_FAIL("nVisibleCount bad"); } #endif ((SvListView*)pView)->nVisibleCount = nPos; @@ -1310,7 +1310,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry ) if( !pEntry->pParent ) { - DBG_ERROR("Removing entry not in model!"); + OSL_FAIL("Removing entry not in model!"); // unter gewissen Umstaenden (welche?) loescht der // Explorer aus der View Eintraege, die er nicht in die View // eingefuegt hat. Da sich der Kunde fuer ein platzendes @@ -1800,7 +1800,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry ) #ifdef DBG_UTIL if( nVisibleCount < nVisibleRemoved ) { - DBG_ERROR("nVisibleRemoved bad"); + OSL_FAIL("nVisibleRemoved bad"); } #endif nVisibleCount -= nVisibleRemoved; @@ -1878,7 +1878,7 @@ void SvListView::ModelNotification( USHORT nActionId, SvListEntry* pEntry1, case LISTACTION_RESORTING: break; default: - DBG_ERROR("unknown ActionId"); + OSL_FAIL("unknown ActionId"); } } diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index 83fc04030ea6..8cfe2c97f5ac 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -89,7 +89,7 @@ void FileControl::ImplBrowseFile( ) } catch( const Exception& ) { - DBG_ERROR( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" ); + OSL_FAIL( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" ); } } diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index f2076a38e842..9900bfe52f09 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -1293,7 +1293,7 @@ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat) UpdateCurrencyFormat(); break; case FCT_KEYONLY: - DBG_ERROR("DoubleCurrencyField::FormatChanged : somebody modified my key !"); + OSL_FAIL("DoubleCurrencyField::FormatChanged : somebody modified my key !"); // We always build our own format from the settings we get via special methods (setCurrencySymbol etc.). // Nobody but ourself should modifiy the format key directly ! break; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 4a298ac9ed36..a427f6bcf4b3 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -264,13 +264,13 @@ public: // ------------------------------------------------------------------- void AssigmentTransientData::setDatasourceName(const ::rtl::OUString&) { - DBG_ERROR( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); + OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" ); } // ------------------------------------------------------------------- void AssigmentTransientData::setCommand(const ::rtl::OUString&) { - DBG_ERROR( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); + OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" ); } // =================================================================== @@ -818,7 +818,7 @@ void AssignmentPersistentData::Commit() } catch(Exception&) { - DBG_ERROR("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!"); + OSL_FAIL("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!"); } const ::rtl::OUString* pDatasourceNames = aDatasourceNames.getConstArray(); const ::rtl::OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength(); @@ -904,7 +904,7 @@ void AssignmentPersistentData::Commit() catch(SQLException& e) { aException <<= e; } catch(Exception&) { - DBG_ERROR("AddressBookSourceDialog::resetTables: could not retrieve the table!"); + OSL_FAIL("AddressBookSourceDialog::resetTables: could not retrieve the table!"); } if (aException.hasValue()) @@ -964,7 +964,7 @@ void AssignmentPersistentData::Commit() } catch(Exception&) { - DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!"); + OSL_FAIL("AddressBookSourceDialog::resetFields: could not retrieve the table columns!"); } @@ -1263,7 +1263,7 @@ void AssignmentPersistentData::Commit() } catch(Exception&) { - DBG_ERROR("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!"); + OSL_FAIL("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!"); } // re-fill the data source list diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx index 3d0df16fe056..d24e7226d2bf 100644 --- a/svtools/source/dialogs/propctrl.cxx +++ b/svtools/source/dialogs/propctrl.cxx @@ -196,7 +196,7 @@ void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const XIdlClassRef xPropClass = rProp.Type; if( !xPropClass.is() ) { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) + OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" ) return; } TypeClass eType = xPropClass->getTypeClass(); @@ -293,7 +293,7 @@ void PropertyEditorControler_Impl::Clicked XIdlClassRef xPropClass = rProp.Type; if( !xPropClass.is() ) { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) + OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" ) return; } TypeClass eType = xPropClass->getTypeClass(); @@ -315,7 +315,7 @@ void PropertyEditorControler_Impl::Commit XIdlClassRef xPropClass = rProp.Type; if( !xPropClass.is() ) { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) + OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" ) return; } TypeClass eType = xPropClass->getTypeClass(); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 9068b493df9d..d652a1a8a294 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -522,7 +522,7 @@ namespace svt WizardState nNextState = determineNextState( nCurrentState ); if ( WZS_INVALID_STATE == nNextState ) { - DBG_ERROR( "OWizardMachine::skipUntil: the given target state does not exist!" ); + OSL_FAIL( "OWizardMachine::skipUntil: the given target state does not exist!" ); return sal_False; } @@ -538,7 +538,7 @@ namespace svt { // argh! prepareLeaveCurrentPage succeeded, determineNextState succeeded, // but ShowPage doesn't? Somebody behaves very strange here .... - DBG_ERROR( "OWizardMachine::skipUntil: very unpolite ...." ); + OSL_FAIL( "OWizardMachine::skipUntil: very unpolite ...." ); m_pImpl->aStateHistory = aOldStateHistory; return sal_False; } @@ -574,7 +574,7 @@ namespace svt { // TODO: this leaves us in a state where we have no current page and an inconsistent state history. // Perhaps we should rollback the skipping here .... - DBG_ERROR("OWizardMachine::skip: very unpolite ...."); + OSL_FAIL("OWizardMachine::skip: very unpolite ...."); // if somebody does a skip and then does not allow to leave ... // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here, // somebody behaves really strange ...) diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 6197ccb81949..de1e30d8f647 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -590,7 +590,7 @@ void WizardDialog::RemovePage( TabPage* pPage ) pPageData = pPageData->mpNext; } - DBG_ERROR( "WizardDialog::RemovePage() - Page not in list" ); + OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" ); } // ----------------------------------------------------------------------- @@ -676,7 +676,7 @@ void WizardDialog::RemoveButton( Button* pButton ) pBtnData = pBtnData->mpNext; } - DBG_ERROR( "WizardDialog::RemoveButton() - Button not in list" ); + OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" ); } // ----------------------------------------------------------------------- diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx index f98e8c7cdc80..18301a181fae 100644 --- a/svtools/source/edit/textdata.cxx +++ b/svtools/source/edit/textdata.cxx @@ -112,7 +112,7 @@ USHORT TETextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, B } } } - DBG_ERROR( "FindPortion: Nicht gefunden!" ); + OSL_FAIL( "FindPortion: Nicht gefunden!" ); return ( Count() - 1 ); } diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index b437943a96bb..59072e2e1d9f 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -241,7 +241,7 @@ BOOL TextCharAttribList::DbgCheckAttribs() if ( pAttr->GetStart() > pAttr->GetEnd() ) { bOK = FALSE; - DBG_ERROR( "Attr verdreht" ); + OSL_FAIL( "Attr verdreht" ); } } return bOK; @@ -553,7 +553,7 @@ String TextDoc::GetText( const sal_Unicode* pSep ) const if ( nLen > STRING_MAXLEN ) { - DBG_ERROR( "Text zu gross fuer String" ); + OSL_FAIL( "Text zu gross fuer String" ); return String(); } @@ -679,13 +679,13 @@ BOOL TextDoc::IsValidPaM( const TextPaM& rPaM ) { if ( rPaM.GetPara() >= maTextNodes.Count() ) { - DBG_ERROR( "PaM: Para out of range" ); + OSL_FAIL( "PaM: Para out of range" ); return FALSE; } TextNode * pNode = maTextNodes.GetObject( rPaM.GetPara() ); if ( rPaM.GetIndex() > pNode->GetText().Len() ) { - DBG_ERROR( "PaM: Index out of range" ); + OSL_FAIL( "PaM: Index out of range" ); return FALSE; } return TRUE; diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 1e9a6b996bc4..45d23bcdbee9 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -2251,7 +2251,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan #endif } break; - default: DBG_ERROR( "ImpPaint: Unknown Portion-Type !" ); + default: OSL_FAIL( "ImpPaint: Unknown Portion-Type !" ); } } diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx index ee788458e609..8ad858a1d877 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx @@ -161,7 +161,7 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" ); + OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" ); } } } @@ -202,7 +202,7 @@ FilterConfigItem::~FilterConfigItem() } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not update configuration data" ); + OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" ); } } } @@ -365,7 +365,7 @@ Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault ) } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::ReadSize - could not read PropertyValue" ); + OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" ); } PropertyValue aWidth; aWidth.Name = sWidth; @@ -442,7 +442,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue ) } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::WriteBool - could not set PropertyValue" ); + OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" ); } } } @@ -476,7 +476,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); + OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); } } } @@ -528,7 +528,7 @@ void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue ) } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::WriteSize - could not read PropertyValue" ); + OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" ); } } } @@ -560,7 +560,7 @@ void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewVa } catch ( ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); + OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" ); } } } @@ -588,7 +588,7 @@ void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny ) } catch ( com::sun::star::uno::Exception& ) { - DBG_ERROR( "FilterConfigItem::WriteAny - could not set PropertyValue" ); + OSL_FAIL( "FilterConfigItem::WriteAny - could not set PropertyValue" ); } } diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx index 430a232724c7..259f518fbf95 100644 --- a/svtools/source/filter.vcl/wmf/enhwmf.cxx +++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx @@ -179,7 +179,7 @@ SvStream& operator>>( SvStream& rIn, XForm& rXForm ) { if ( sizeof( float ) != 4 ) { - DBG_ERROR( "EnhWMFReader::sizeof( float ) != 4" ); + OSL_FAIL( "EnhWMFReader::sizeof( float ) != 4" ); rXForm = XForm(); } else diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx index f86dfe30361b..4e52fb4d548c 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.cxx +++ b/svtools/source/filter.vcl/wmf/winmtf.cxx @@ -816,7 +816,7 @@ void WinMtfOutput::CreateObject( INT32 nIndex, GDIObjectType eType, void* pStyle break; default: - DBG_ERROR( "unsupported style not deleted" ); + OSL_FAIL( "unsupported style not deleted" ); break; } } diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index b842987e899b..a068ad3eb3da 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -527,7 +527,7 @@ struct GDIObj break; default: - DBG_ERROR( "unsupported style deleted" ); + OSL_FAIL( "unsupported style deleted" ); break; } pStyle = NULL; diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx index 7e1d67d7c2df..5214918b9870 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.cxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx @@ -1743,7 +1743,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_MASKSCALE_ACTION: case META_MASKSCALEPART_ACTION: { - DBG_ERROR( "Unsupported action: MetaMask...Action!" ); + OSL_FAIL( "Unsupported action: MetaMask...Action!" ); } break; @@ -1752,13 +1752,13 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_ISECTREGIONCLIPREGION_ACTION: { - DBG_ERROR( "Unsupported action: MetaISectRegionClipRegionAction!" ); + OSL_FAIL( "Unsupported action: MetaISectRegionClipRegionAction!" ); } break; case META_MOVECLIPREGION_ACTION: { - DBG_ERROR( "Unsupported action: MetaMoveClipRegionAction!" ); + OSL_FAIL( "Unsupported action: MetaMoveClipRegionAction!" ); } break; } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 9414b19a5d92..129ea5b5721e 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -512,7 +512,7 @@ ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& } else { - DBG_ERROR( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" ); + OSL_FAIL( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" ); nNeededSize = 256000; } } diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 629d3202d962..51aada3e5cc5 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1806,7 +1806,7 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, UL if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() ) { - DBG_ERROR( "Missing implementation: Mtf-Transparency" ); + OSL_FAIL( "Missing implementation: Mtf-Transparency" ); } } @@ -1854,12 +1854,12 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr if( ( nAdjustmentFlags & ADJUSTMENT_ROTATE ) && aAttr.IsRotated() ) { - DBG_ERROR( "Missing implementation: Animation-Rotation" ); + OSL_FAIL( "Missing implementation: Animation-Rotation" ); } if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() ) { - DBG_ERROR( "Missing implementation: Animation-Transparency" ); + OSL_FAIL( "Missing implementation: Animation-Transparency" ); } } diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx index 4d73588ec51c..ab51d32bd64e 100644 --- a/svtools/source/misc/chartprettypainter.cxx +++ b/svtools/source/misc/chartprettypainter.cxx @@ -134,7 +134,7 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh catch( uno::Exception& e ) { (void)e; - DBG_ERROR( "Chart cannot be painted pretty!" ); + OSL_FAIL( "Chart cannot be painted pretty!" ); } return false; } diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 34886a78915f..1ae633cad254 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -428,7 +428,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate ) } else { - DBG_ERROR("No update, but replacement exists already!"); + OSL_FAIL("No update, but replacement exists already!"); return; } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 20da20142c6f..1543d2b5e076 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -263,7 +263,7 @@ namespace svt { if ( !_rLHS.is() || !_rRHS.is() ) { - DBG_ERROR( "TemplateContentEqual::operator(): invalid contents!" ); + OSL_FAIL( "TemplateContentEqual::operator(): invalid contents!" ); return true; // this is not strictly true, in case only one is invalid - but this is a heavy error anyway } @@ -691,7 +691,7 @@ namespace svt } catch( const Exception& ) { - DBG_ERROR( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" ); + OSL_FAIL( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" ); return sal_False; } return sal_True; @@ -788,7 +788,7 @@ namespace svt INetURLObject aStorageURL( sStorageURL ); if ( INET_PROT_NOT_VALID == aStorageURL.GetProtocol() ) { - DBG_ERROR( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" ); + OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" ); return sal_False; } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 5dbc443708b2..8743058f39cf 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -634,7 +634,7 @@ void TransferableHelper::ImplFlush() } catch( const ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "Could not flush clipboard" ); + OSL_FAIL( "Could not flush clipboard" ); } Application::AcquireSolarMutex( nRef ); @@ -1038,7 +1038,7 @@ sal_Bool TransferableHelper::SetInterface( const ::com::sun::star::uno::Referenc sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& ) { - DBG_ERROR( "TransferableHelper::WriteObject( ... ) not implemented" ); + OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" ); return sal_False; } diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx index 3e3ba5f64d52..07dcb095535a 100644 --- a/svtools/source/productregistration/registrationdlg.cxx +++ b/svtools/source/productregistration/registrationdlg.cxx @@ -133,7 +133,7 @@ namespace svt #ifdef DBG_UTIL else { - DBG_ERROR( "RegistrationDialog::Execute: invalid dialog state!" ); + OSL_FAIL( "RegistrationDialog::Execute: invalid dialog state!" ); } #endif } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 8714d2c96f3d..a02dd9a2a50d 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -137,13 +137,13 @@ namespace svt { namespace table } virtual PColumnModel getColumnModel( ColPos column ) { - DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" ); + OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" ); (void)column; return PColumnModel(); } virtual PColumnModel getColumnModelByID( ColumnID id ) { - DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" ); + OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" ); (void)id; return PColumnModel(); } @@ -1517,7 +1517,7 @@ namespace svt { namespace table } break; default: - DBG_ERROR( "TableControl_Impl::dispatchAction: unsupported action!" ); + OSL_FAIL( "TableControl_Impl::dispatchAction: unsupported action!" ); } return bSuccess; } diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index 6be5a1962d96..26084690c137 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -290,7 +290,7 @@ using namespace ::com::sun::star::uno; { (void) listener; // TODO - DBG_ERROR( "DefaultTableModel::addTableModelListener: not yet implemented!" ); + OSL_FAIL( "DefaultTableModel::addTableModelListener: not yet implemented!" ); } //-------------------------------------------------------------------- @@ -298,7 +298,7 @@ using namespace ::com::sun::star::uno; { (void)listener; // TODO - DBG_ERROR( "DefaultTableModel::removeTableModelListener: not yet implemented!" ); + OSL_FAIL( "DefaultTableModel::removeTableModelListener: not yet implemented!" ); } //-------------------------------------------------------------------- @@ -319,7 +319,7 @@ using namespace ::com::sun::star::uno; { (void)id; // TODO - DBG_ERROR( "DefaultTableModel::getColumnModelByID: not yet implemented!" ); + OSL_FAIL( "DefaultTableModel::getColumnModelByID: not yet implemented!" ); return PColumnModel(); } diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index a990acf11fbd..7ae5fab30b7c 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -282,7 +282,7 @@ void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny, } case JAVASCRIPT: default: - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } } // else: bRetValueOK not set diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 33a0d671aae7..dc74dc3ea8ff 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -440,7 +440,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN: meLineEndType = LINEEND_CR; break; case ::com::sun::star::awt::LineEndFormat::LINE_FEED: meLineEndType = LINEEND_LF; break; case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: meLineEndType = LINEEND_CRLF; break; - default: DBG_ERROR( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break; + default: OSL_FAIL( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break; } } break; @@ -496,7 +496,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const case LINEEND_CR: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN; break; case LINEEND_LF: nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED; break; case LINEEND_CRLF: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED; break; - default: DBG_ERROR( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break; + default: OSL_FAIL( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break; } aProp <<= nLineEndType; } diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 3d10bb97167c..37fcc45f20f9 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -492,7 +492,7 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries bOk = *pValues >>= maPolygon; break; default: - DBG_ERROR( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" ); + OSL_FAIL( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" ); break; } @@ -542,7 +542,7 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries *pValues <<= maPolygon; break; default: - DBG_ERROR( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" ); + OSL_FAIL( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" ); break; } diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 8b02edcfd512..3257da29fb49 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -203,7 +203,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_MENU_HIDE: break; - default: DBG_ERROR( "MenuEventListener - Unknown event!" ); + default: OSL_FAIL( "MenuEventListener - Unknown event!" ); } } } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 1f871b3d5995..831a9d07506a 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -178,7 +178,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } return bDifferent; @@ -202,7 +202,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } } @@ -221,7 +221,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r break; default: { - DBG_ERROR( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); + OSL_FAIL( "VCLXPrinterPropertySet_Impl::convertFastPropertyValue - invalid Handle" ); } } } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 808acf892730..aac6b3d587d4 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1005,7 +1005,7 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) } catch ( const ::com::sun::star::uno::Exception& ) { - DBG_ERROR( "VCLXWindow::dispose: could not dispose the accessible context!" ); + OSL_FAIL( "VCLXWindow::dispose: could not dispose the accessible context!" ); } mpImpl->mxAccessibleContext.clear(); @@ -1327,7 +1327,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript BackgroundColor = rStyleSettings.GetDialogColor().GetColor(); } break; - default: DBG_ERROR( "VCLWindow::getStyles() - unknown Type" ); + default: OSL_FAIL( "VCLWindow::getStyles() - unknown Type" ); } } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 620ee6bab0ee..7e6a1ffcd535 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -900,7 +900,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException) case STATE_NOCHECK: nState = 0; break; case STATE_CHECK: nState = 1; break; case STATE_DONTKNOW: nState = 2; break; - default: DBG_ERROR( "VCLXCheckBox::getState(): unknown TriState!" ); + default: OSL_FAIL( "VCLXCheckBox::getState(): unknown TriState!" ); } } diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 40db8aae5b51..51b00190a921 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -150,7 +150,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo } catch( const Exception& ) { - DBG_ERROR( "DisposeControlModel::(): caught an exception while disposing a component!" ); + OSL_FAIL( "DisposeControlModel::(): caught an exception while disposing a component!" ); } } }; @@ -909,7 +909,7 @@ sal_Bool SAL_CALL UnoControlDialogModel::getGroupControl( ) throw (RuntimeExcep // ---------------------------------------------------------------------------- void SAL_CALL UnoControlDialogModel::setGroupControl( sal_Bool ) throw (RuntimeException) { - DBG_ERROR( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); + OSL_FAIL( "UnoControlDialogModel::setGroupControl: explicit grouping not supported" ); } // ---------------------------------------------------------------------------- @@ -1004,7 +1004,7 @@ void SAL_CALL UnoControlDialogModel::setGroup( const Sequence< Reference< XContr // We only have a sequence of control models, and we _know_ (yes, that's a HACK relying on // implementation details) that VCL does grouping according to the order of controls automatically // At least VCL does this for all we're interested in: Radio buttons. - DBG_ERROR( "UnoControlDialogModel::setGroup: grouping not supported" ); + OSL_FAIL( "UnoControlDialogModel::setGroup: grouping not supported" ); } // ---------------------------------------------------------------------------- @@ -1027,7 +1027,7 @@ namespace } catch( const Exception& ) { - DBG_ERROR( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); + OSL_FAIL( "lcl_getDialogStep: caught an exception while determining the dialog page!" ); } return nStep; } @@ -1052,7 +1052,7 @@ void SAL_CALL UnoControlDialogModel::getGroup( sal_Int32 _nGroup, Sequence< Refe if ( ( _nGroup < 0 ) || ( _nGroup >= (sal_Int32)maGroups.size() ) ) { - DBG_ERROR( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); + OSL_FAIL( "UnoControlDialogModel::getGroup: invalid argument and I am not allowed to throw an exception!" ); _rGroup.realloc( 0 ); _rName = ::rtl::OUString(); } diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index fa1c49ffcb91..ccdbe1f26fca 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -210,7 +210,7 @@ case GCM_PROPERTY_ID_STEP: aDefault <<= (sal_Int32) 0; break; case GCM_PROPERTY_ID_TAG: aDefault <<= ::rtl::OUString(); break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aDefault <<= Reference< resource::XStringResourceResolver >(); break; - default: DBG_ERROR( "ImplGetDefaultValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplGetDefaultValueByHandle - unknown Property" ); } return aDefault; @@ -232,7 +232,7 @@ case GCM_PROPERTY_ID_STEP: aValue <<= m_nStep; break; case GCM_PROPERTY_ID_TAG: aValue <<= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue <<= m_xStrResolver; break; - default: DBG_ERROR( "ImplGetPropertyValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplGetPropertyValueByHandle - unknown Property" ); } return aValue; @@ -252,7 +252,7 @@ case GCM_PROPERTY_ID_STEP: aValue >>= m_nStep; break; case GCM_PROPERTY_ID_TAG: aValue >>= m_aTag; break; case GCM_PROPERTY_ID_RESOURCERESOLVER: aValue >>= m_xStrResolver; break; - default: DBG_ERROR( "ImplSetPropertyValueByHandle - unknown Property" ); + default: OSL_FAIL( "ImplSetPropertyValueByHandle - unknown Property" ); } } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index b5b9723d39bb..179cbe17b9ab 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -160,7 +160,7 @@ namespace toolkit break; default: { - DBG_ERROR( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" ); + OSL_FAIL( "UnoScrollBarControl::adjustmentValueChanged - unknown Type" ); } } diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 178108621f7f..6006c6514161 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -217,7 +217,7 @@ namespace toolkit ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( rEvent.Value ), sal_False ); break; default: - DBG_ERROR( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" ); + OSL_FAIL( "UnoSpinButtonControl::adjustmentValueChanged - unknown Type" ); } if ( maAdjustmentListeners.getLength() ) diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 40a8dd456516..24567118016b 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -374,7 +374,7 @@ void UnoControl::disposeAccessibleContext() } catch( const Exception& ) { - DBG_ERROR( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" ); + OSL_FAIL( "UnoControl::disposeAccessibleContext: could not dispose my AccessibleContext!" ); } } } @@ -1452,7 +1452,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException) // XServiceInfo ::rtl::OUString UnoControl::getImplementationName( ) throw(RuntimeException) { - DBG_ERROR( "This method should be overloaded!" ); + OSL_FAIL( "This method should be overloaded!" ); return ::rtl::OUString(); } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 9c0e273cc550..9a38a551e149 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -147,7 +147,7 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue >>= rFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } @@ -195,7 +195,7 @@ UnoControlModel::~UnoControlModel() UnoControlModel* UnoControlModel::Clone() const { - DBG_ERROR( "UnoControlModel::Clone() ?!" ); + OSL_FAIL( "UnoControlModel::Clone() ?!" ); return NULL; } @@ -249,7 +249,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_FONTDESCRIPTORPART_KERNING: aDefault <<= aFD.Kerning; break; case BASEPROPERTY_FONTDESCRIPTORPART_WORDLINEMODE: aDefault <<= aFD.WordLineMode; break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: aDefault <<= aFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } else @@ -445,7 +445,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const } break; - default: DBG_ERROR( "ImplGetDefaultValue - unknown Property" ); + default: OSL_FAIL( "ImplGetDefaultValue - unknown Property" ); } } @@ -607,7 +607,7 @@ void UnoControlModel::setPropertyToDefault( const ::rtl::OUString& PropertyName { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - DBG_ERROR( "ServiceName von UnoControlModel ?!" ); + OSL_FAIL( "ServiceName von UnoControlModel ?!" ); return ::rtl::OUString(); } @@ -819,7 +819,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference< ::com::sun: } else { - DBG_ERROR( "Property?!" ); + OSL_FAIL( "Property?!" ); } sal_Int32 nPropDataLen = xMark->offsetToMark( nPropDataBeginMark ); @@ -1027,7 +1027,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: } else { - DBG_ERROR( "read: unknown Property!" ); + OSL_FAIL( "read: unknown Property!" ); } } } @@ -1090,7 +1090,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun:: // ::com::sun::star::lang::XServiceInfo ::rtl::OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { - DBG_ERROR( "This method should be overloaded!" ); + OSL_FAIL( "This method should be overloaded!" ); return ::rtl::OUString(); } @@ -1116,7 +1116,7 @@ sal_Bool UnoControlModel::supportsService( const ::rtl::OUString& rServiceName ) // ::cppu::OPropertySetHelper ::cppu::IPropertyArrayHelper& UnoControlModel::getInfoHelper() { - DBG_ERROR( "UnoControlModel::getInfoHelper() not possible!" ); + OSL_FAIL( "UnoControlModel::getInfoHelper() not possible!" ); return *(::cppu::IPropertyArrayHelper*) NULL; } @@ -1317,12 +1317,12 @@ void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, break; case BASEPROPERTY_FONTDESCRIPTORPART_TYPE: rValue <<= aFD.Type; break; - default: DBG_ERROR( "FontProperty?!" ); + default: OSL_FAIL( "FontProperty?!" ); } } else { - DBG_ERROR( "getFastPropertyValue - invalid Property!" ); + OSL_FAIL( "getFastPropertyValue - invalid Property!" ); } } @@ -1379,7 +1379,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const ::com::sun: // ::com::sun::star::beans::XMultiPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlModel::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { - DBG_ERROR( "UnoControlModel::getPropertySetInfo() not possible!" ); + OSL_FAIL( "UnoControlModel::getPropertySetInfo() not possible!" ); return ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >(); } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 39a384dfd591..af6a77695245 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -720,7 +720,7 @@ UnoButtonControl::UnoButtonControl() break; default: { - DBG_ERROR( "Unknown Button Type!" ); + OSL_FAIL( "Unknown Button Type!" ); } } } diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 8e37dc74e889..d9e79be6b59e 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -187,7 +187,7 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref { int i = 0; i++; - // DBG_ERROR( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); + // OSL_FAIL( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" ); } pVCLXWindow->SetWindow( pWindow ); pWindow->SetWindowPeer( xIFace, pVCLXWindow ); diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 3f9d142dd6b6..a9f62f823d58 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -246,7 +246,7 @@ float VCLUnoHelper::ConvertFontWidth( FontWidth eWidth ) else if( eWidth == WIDTH_ULTRA_EXPANDED ) return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; - DBG_ERROR( "Unknown FontWidth" ); + OSL_FAIL( "Unknown FontWidth" ); return ::com::sun::star::awt::FontWidth::DONTKNOW; } @@ -273,7 +273,7 @@ FontWidth VCLUnoHelper::ConvertFontWidth( float f ) else if( f <= ::com::sun::star::awt::FontWidth::ULTRAEXPANDED ) return WIDTH_ULTRA_EXPANDED; - DBG_ERROR( "Unknown FontWidth" ); + OSL_FAIL( "Unknown FontWidth" ); return WIDTH_DONTKNOW; } @@ -300,7 +300,7 @@ float VCLUnoHelper::ConvertFontWeight( FontWeight eWeight ) else if( eWeight == WEIGHT_BLACK ) return ::com::sun::star::awt::FontWeight::BLACK; - DBG_ERROR( "Unknown FontWeigth" ); + OSL_FAIL( "Unknown FontWeigth" ); return ::com::sun::star::awt::FontWeight::DONTKNOW; } @@ -327,7 +327,7 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f ) else if( f <= ::com::sun::star::awt::FontWeight::BLACK ) return WEIGHT_BLACK; - DBG_ERROR( "Unknown FontWeigth" ); + OSL_FAIL( "Unknown FontWeigth" ); return WEIGHT_DONTKNOW; } diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx index e4089df5f3a9..93b5f53f4482 100644 --- a/toolkit/source/layout/core/box-base.cxx +++ b/toolkit/source/layout/core/box-base.cxx @@ -52,7 +52,7 @@ static bool isVisible( uno::Reference< awt::XLayoutConstrains > xWidget ) { if ( !xWidget.is() ) { - DBG_ERROR( "FIXME: invalid child !" ); + OSL_FAIL( "FIXME: invalid child !" ); return true; } @@ -132,7 +132,7 @@ Box_Base::removeChild( const uno::Reference< awt::XLayoutConstrains >& xChild ) } else { - DBG_ERROR( "Box_Base: removeChild: no such child" ); + OSL_FAIL( "Box_Base: removeChild: no such child" ); } } diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx index f5822bc4569a..2b59ffc0236c 100644 --- a/toolkit/source/layout/core/container.cxx +++ b/toolkit/source/layout/core/container.cxx @@ -76,7 +76,7 @@ Container::allocateChildAt( const uno::Reference< awt::XLayoutConstrains > &xChi awt::PosSize::POSSIZE ); else { - DBG_ERROR( "Error: non-sizeable child" ); + OSL_FAIL( "Error: non-sizeable child" ); } } } diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx index ed7b35dafa51..20e2f82342ba 100644 --- a/toolkit/source/layout/core/dialogbuttonhbox.cxx +++ b/toolkit/source/layout/core/dialogbuttonhbox.cxx @@ -185,7 +185,7 @@ DialogButtonHBox::removeChild( uno::Reference< awt::XLayoutConstrains > const& x } else { - DBG_ERROR( "DialogButtonHBox: removeChild: no such child" ); + OSL_FAIL( "DialogButtonHBox: removeChild: no such child" ); } } diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index b90cc45bda53..6a0ca24d8c45 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -107,7 +107,7 @@ SAL_THROW (()) } // DEBUG: else if ( pParent == NULL ) { - DBG_ERROR( "Fatal error: top node isn't a dialog" ); + OSL_FAIL( "Fatal error: top node isn't a dialog" ); } OUString aOrdering; diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx index f843a5eafca2..9c7ad34d2e64 100644 --- a/toolkit/source/layout/core/proplist.cxx +++ b/toolkit/source/layout/core/proplist.cxx @@ -246,7 +246,7 @@ setProperties( uno::Reference< uno::XInterface > const& xPeer, { if ( !prophlp::canHandleProps( xPeer ) ) { - DBG_ERROR( "Error: setProperties - bad handle ignoring props:\n" ); + OSL_FAIL( "Error: setProperties - bad handle ignoring props:\n" ); for ( PropList::const_iterator it = rProps.begin(); it != rProps.end(); ++it ) { diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx index 0fa756a33f03..d05074908475 100644 --- a/toolkit/workben/layout/zoom.cxx +++ b/toolkit/workben/layout/zoom.cxx @@ -197,7 +197,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "wrong button number" ); + OSL_FAIL( "wrong button number" ); } } @@ -220,7 +220,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } @@ -498,7 +498,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } @@ -585,7 +585,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } #if !TEST_LAYOUT diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 001e80d13bb0..17b719298132 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1386,7 +1386,7 @@ DirEntry& DirEntry::operator=( const DirEntry& rEntry ) if ( this == &rEntry ) return *this; if ( rEntry.nError != FSYS_ERR_OK ) { - DBG_ERROR("Zuweisung mit invalidem DirEntry"); + OSL_FAIL("Zuweisung mit invalidem DirEntry"); nError = rEntry.nError; return *this; } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 7560434ebc79..d313169d127d 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -5252,7 +5252,7 @@ void INetURLObject::appendUCS4(rtl::OUStringBuffer& rTheText, sal_uInt32 nUCS4, switch (eTargetCharset) { default: - DBG_ERROR("INetURLObject::appendUCS4(): Unsupported charset"); + OSL_FAIL("INetURLObject::appendUCS4(): Unsupported charset"); case RTL_TEXTENCODING_ASCII_US: case RTL_TEXTENCODING_ISO_8859_1: appendEscape(rTheText, cEscapePrefix, nUCS4); @@ -5298,7 +5298,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin, switch (eCharset) { default: - DBG_ERROR( + OSL_FAIL( "INetURLObject::getUTF32(): Unsupported charset"); case RTL_TEXTENCODING_ASCII_US: rEscapeType = INetMIME::isUSASCII(nUTF32) ? diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index 509c997419f9..4af4b3edcb85 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -112,18 +112,18 @@ void B3dTransformationSet::Ortho(basegfx::B3DHomMatrix& rTarget, double fLeft, d { if(fNear == fFar) { - DBG_ERROR("Near and far clipping plane in Ortho definition are identical"); + OSL_FAIL("Near and far clipping plane in Ortho definition are identical"); fFar = fNear + 1.0; } if(fLeft == fRight) { - DBG_ERROR("Left and right in Ortho definition are identical"); + OSL_FAIL("Left and right in Ortho definition are identical"); fLeft -= 1.0; fRight += 1.0; } if(fTop == fBottom) { - DBG_ERROR("Top and bottom in Ortho definition are identical"); + OSL_FAIL("Top and bottom in Ortho definition are identical"); fBottom -= 1.0; fTop += 1.0; } diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index f57a185d5e04..ae99ab7ed886 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -871,7 +871,7 @@ BigInt& BigInt::operator/=( const BigInt& rVal ) { if ( rVal.nVal == 0 ) { - DBG_ERROR( "BigInt::operator/ --> divide by zero" ); + OSL_FAIL( "BigInt::operator/ --> divide by zero" ); return *this; } @@ -932,7 +932,7 @@ void BigInt::DivMod( const BigInt& rVal, BigInt& rMod ) { if ( rVal.nVal == 0 ) { - DBG_ERROR( "BigInt::operator/ --> divide by zero" ); + OSL_FAIL( "BigInt::operator/ --> divide by zero" ); return; } @@ -1001,7 +1001,7 @@ BigInt& BigInt::operator%=( const BigInt& rVal ) { if ( rVal.nVal == 0 ) { - DBG_ERROR( "BigInt::operator/ --> divide by zero" ); + OSL_FAIL( "BigInt::operator/ --> divide by zero" ); return *this; } diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 07d794de80bf..7dbdbaf3f419 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -569,7 +569,7 @@ void Fraction::ReduceInaccurate( unsigned nSignificantBits ) if ( !nMul || !nDiv ) { // Return without reduction - DBG_ERROR( "Oops, we reduced too much..." ); + OSL_FAIL( "Oops, we reduced too much..." ); return; } diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 5a7c9bd62394..ccf35d259bc5 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -2248,7 +2248,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) // #127979# Reduce source point count hard to the limit of the tools Polygon if(nB2DLocalCount > ((0x0000ffff / 3L) - 1L)) { - DBG_ERROR("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); + OSL_FAIL("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); nB2DLocalCount = ((0x0000ffff / 3L) - 1L); } @@ -2342,7 +2342,7 @@ Polygon::Polygon(const basegfx::B2DPolygon& rPolygon) // #127979# Reduce source point count hard to the limit of the tools Polygon if(nB2DLocalCount > (0x0000ffff - 1L)) { - DBG_ERROR("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); + OSL_FAIL("Polygon::Polygon: Too many points in given B2DPolygon, need to reduce hard to maximum of tools Polygon (!)"); nB2DLocalCount = (0x0000ffff - 1L); } diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 945c2fd9657e..5d80ebd8f7a6 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -1549,7 +1549,7 @@ const sal_Char * INetMIME::getCharsetName(rtl_TextEncoding eEncoding) return "ISO-10646-UCS-2"; default: - DBG_ERROR("INetMIME::getCharsetName(): Unsupported encoding"); + OSL_FAIL("INetMIME::getCharsetName(): Unsupported encoding"); return 0; } } diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 106fe98fed06..ce2e3f7fa36f 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -367,13 +367,13 @@ USHORT ErrorHandler::HandleError_Impl( } } } - DBG_ERROR("Error nicht behandelt"); + OSL_FAIL("Error nicht behandelt"); // Error 1 ist General Error im Sfx if(pInfo->GetErrorCode()!=1) { HandleError_Impl(1, USHRT_MAX, bJustCreateString, rError); } else { - DBG_ERROR("Error 1 nicht gehandeled"); + OSL_FAIL("Error 1 nicht gehandeled"); } delete pInfo; return 0; diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index b03ad40aef5b..31c37b3086b6 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -133,7 +133,7 @@ SvPersistStream& operator >> ( SvPersistStream & rStm, if( (nVer & ~PERSIST_LIST_DBGUTIL) != PERSIST_LIST_VER ) { rStm.SetError( SVSTREAM_GENERALERROR ); - DBG_ERROR( "persist list, false version" ); + OSL_FAIL( "persist list, false version" ); } UINT32 nObjLen(0), nObjPos(0); @@ -442,14 +442,14 @@ UINT32 SvPersistStream::ReadCompressed if( nMask & 0x0F ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ); + OSL_FAIL( "format error" ); } rStm >> nRet; } else { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ); + OSL_FAIL( "format error" ); } return nRet; } @@ -743,7 +743,7 @@ UINT32 SvPersistStream::ReadObj if( P_VER < (nHdr & P_VER_MASK) ) { SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "false version" ); + OSL_FAIL( "false version" ); } if( !(nHdr & P_ID_0) && GetError() == SVSTREAM_OK ) diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 9f6480c16ce2..879ce44d6d83 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -197,7 +197,7 @@ ErrCode SvLockBytes::ReadAt(sal_Size nPos, void * pBuffer, sal_Size nCount, { if (!m_pStream) { - DBG_ERROR("SvLockBytes::ReadAt(): Bad stream"); + OSL_FAIL("SvLockBytes::ReadAt(): Bad stream"); return ERRCODE_NONE; } @@ -215,7 +215,7 @@ ErrCode SvLockBytes::WriteAt(sal_Size nPos, const void * pBuffer, sal_Size nCoun { if (!m_pStream) { - DBG_ERROR("SvLockBytes::WriteAt(): Bad stream"); + OSL_FAIL("SvLockBytes::WriteAt(): Bad stream"); return ERRCODE_NONE; } @@ -232,7 +232,7 @@ ErrCode SvLockBytes::Flush() const { if (!m_pStream) { - DBG_ERROR("SvLockBytes::Flush(): Bad stream"); + OSL_FAIL("SvLockBytes::Flush(): Bad stream"); return ERRCODE_NONE; } @@ -246,7 +246,7 @@ ErrCode SvLockBytes::SetSize(sal_Size nSize) { if (!m_pStream) { - DBG_ERROR("SvLockBytes::SetSize(): Bad stream"); + OSL_FAIL("SvLockBytes::SetSize(): Bad stream"); return ERRCODE_NONE; } @@ -257,7 +257,7 @@ ErrCode SvLockBytes::SetSize(sal_Size nSize) //============================================================================ ErrCode SvLockBytes::LockRegion(sal_Size, sal_Size, LockType) { - DBG_ERROR("SvLockBytes::LockRegion(): Not implemented"); + OSL_FAIL("SvLockBytes::LockRegion(): Not implemented"); return ERRCODE_NONE; } @@ -265,7 +265,7 @@ ErrCode SvLockBytes::LockRegion(sal_Size, sal_Size, LockType) ErrCode SvLockBytes::UnlockRegion(sal_Size, sal_Size, LockType) { - DBG_ERROR("SvLockBytes::UnlockRegion(): Not implemented"); + OSL_FAIL("SvLockBytes::UnlockRegion(): Not implemented"); return ERRCODE_NONE; } @@ -274,7 +274,7 @@ ErrCode SvLockBytes::Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const { if (!m_pStream) { - DBG_ERROR("SvLockBytes::Stat(): Bad stream"); + OSL_FAIL("SvLockBytes::Stat(): Bad stream"); return ERRCODE_NONE; } diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 20ffae533f68..95fc092ad799 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -261,7 +261,7 @@ UniString& UniString::AssignAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ) { if ( !pAsciiStr[i] ) { - DBG_ERROR( "UniString::AssignAscii() : nLen is wrong" ); + OSL_FAIL( "UniString::AssignAscii() : nLen is wrong" ); } } } @@ -338,7 +338,7 @@ UniString& UniString::AppendAscii( const sal_Char* pAsciiStr, xub_StrLen nLen ) { if ( !pAsciiStr[i] ) { - DBG_ERROR( "UniString::AppendAscii() : nLen is wrong" ); + OSL_FAIL( "UniString::AppendAscii() : nLen is wrong" ); } } } diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 72e6fcdea593..dd7ad23326c1 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -355,7 +355,7 @@ STRING::STRING( const STRCODE* pCharStr, xub_StrLen nLen ) { if ( !pCharStr[i] ) { - DBG_ERROR( "String::String() : nLen is wrong" ); + OSL_FAIL( "String::String() : nLen is wrong" ); } } } @@ -459,7 +459,7 @@ STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen ) { if ( !pCharStr[i] ) { - DBG_ERROR( "String::Assign() : nLen is wrong" ); + OSL_FAIL( "String::Assign() : nLen is wrong" ); } } } @@ -590,7 +590,7 @@ STRING& STRING::Append( const STRCODE* pCharStr, xub_StrLen nCharLen ) { if ( !pCharStr[i] ) { - DBG_ERROR( "String::Append() : nLen is wrong" ); + OSL_FAIL( "String::Append() : nLen is wrong" ); } } } diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx index 8ed3ffd2d76c..c62abdb4584d 100644 --- a/tools/source/testtoolloader/testtoolloader.cxx +++ b/tools/source/testtoolloader/testtoolloader.cxx @@ -67,7 +67,7 @@ String GetCommandLineParam( sal_uInt32 nParam ) return String( aParam ); else { - DBG_ERROR( "Unable to get CommandLineParam" ); + OSL_FAIL( "Unable to get CommandLineParam" ); return String(); } } diff --git a/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx index 5f75d481e8db..c431ea159160 100644 --- a/tools/workben/hashtbl.cxx +++ b/tools/workben/hashtbl.cxx @@ -138,7 +138,7 @@ void* HashTable::GetObjectAt(ULONG lPos) const void HashTable::OnDeleteObject(void*) { - DBG_ERROR("HashTable::OnDeleteObject(void*) nicht überladen"); + OSL_FAIL("HashTable::OnDeleteObject(void*) nicht überladen"); } ULONG HashTable::Hash(String const& Key) const @@ -222,7 +222,7 @@ BOOL HashTable::Insert(String const& Key, void* pObject) if (IsFull()) { - DBG_ERROR("HashTable::Insert() is full"); + OSL_FAIL("HashTable::Insert() is full"); return FALSE; } diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index 72c0c249ce19..31bd1d0c9211 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -1085,7 +1085,7 @@ void MyApp::Main() cppu::defaultBootstrap_InitialComponentContext() ); if ( !xCtx.is() ) { - DBG_ERROR( "Error creating initial component context!" ); + OSL_FAIL( "Error creating initial component context!" ); return; } @@ -1094,13 +1094,13 @@ void MyApp::Main() if ( !xFac.is() ) { - DBG_ERROR( "No service manager!" ); + OSL_FAIL( "No service manager!" ); return; } } catch ( com::sun::star::uno::Exception const & ) { - DBG_ERROR( "Exception during creation of initial component context!" ); + OSL_FAIL( "Exception during creation of initial component context!" ); return; } @@ -1131,7 +1131,7 @@ void MyApp::Main() if ( !bSuccess ) { - DBG_ERROR( "Error creating UCB!" ); + OSL_FAIL( "Error creating UCB!" ); return; } diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 18662c4e90c0..b17771cb4369 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -362,7 +362,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) //***************************************************************************************************************** void SvtCommandOptions_Impl::Commit() { - DBG_ERROR( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); + OSL_FAIL( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); } //***************************************************************************************************************** diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 87f535f72399..76950ee441bc 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -539,7 +539,7 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::Commit() { - DBG_ERROR( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" ); + OSL_FAIL( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" ); /* // Write all properties! // Delete complete sets first. diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 12598f4fb9ab..d64958b15b4e 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -257,7 +257,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() if ( seqValues[nProperty] >>= nMode ) m_eOpenHyperlinkMode = (SvtExtendedSecurityOptions::OpenHyperlinkMode)nMode; else { - DBG_ERROR("Wrong type for Open mode!"); + OSL_FAIL("Wrong type for Open mode!"); } m_bROOpenHyperlinkMode = seqRO[nProperty]; } diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 9b0ef5322179..e380bcbb0b7e 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -374,7 +374,7 @@ static ULONG lcl_GetFlag(sal_Int32 nProp) case 10: nFlag = FILTERCFG_ENABLE_WORD_PREVIEW; break; case 11: nFlag = FILTERCFG_USE_ENHANCED_FIELDS; break; - default: DBG_ERROR("illegal value"); + default: OSL_FAIL("illegal value"); } return nFlag; } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index d6b39f621b87..ac2e7f797f76 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -95,7 +95,7 @@ static const char* getKeyType( int nKeyType ) case DEFAULTFONT_UI_FIXED: return "UI_FIXED"; case DEFAULTFONT_UI_SANS: return "UI_SANS"; default: - DBG_ERROR( "unmatched type" ); + OSL_FAIL( "unmatched type" ); return ""; } } diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 135c3467da8a..3d7eddf9c89f 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -468,7 +468,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : if ( !m_xPathSettings.is() ) { // #112719#: check for existance - DBG_ERROR( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); + OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Service com.sun.star.util.PathSettings cannot be created" )), Reference< XInterface >() ); @@ -481,7 +481,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : if ( !m_xSubstVariables.is() ) { // #112719#: check for existance - DBG_ERROR( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); + OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Service com.sun.star.util.PathSubstitution cannot be created" )), Reference< XInterface >() ); diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 3a28cbc0a8e1..80ba32920550 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -442,7 +442,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() if ( pValues[nProp] >>= nTemp ) nAutoSaveTime = nTemp; else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); }; bROAutoSaveTime = pROStates[nProp]; break; @@ -533,7 +533,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() } else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); } } } @@ -559,7 +559,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall"))) >>= nAutoSaveTime; } catch(const css::uno::Exception&) - { DBG_ERROR("Could not find needed informations for AutoSave feature."); } + { OSL_FAIL("Could not find needed informations for AutoSave feature."); } } SvtSaveOptions_Impl::~SvtSaveOptions_Impl() diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 9f9e5ff5e8d9..5da91ee1789a 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -216,18 +216,18 @@ BOOL SvtSearchOptions_Impl::Load() SetFlag( i, bVal ); } else { - DBG_ERROR( "unexpected index" ); + OSL_FAIL( "unexpected index" ); } } else { - DBG_ERROR( "unexpected type" ); + OSL_FAIL( "unexpected type" ); bSucc = FALSE; } } else { - DBG_ERROR( "value missing" ); + OSL_FAIL( "value missing" ); bSucc = FALSE; } } diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx index 45f296fdcbe1..36c1c2308ec5 100644 --- a/unotools/source/config/undoopt.cxx +++ b/unotools/source/config/undoopt.cxx @@ -132,13 +132,13 @@ void SvtUndoOptions_Impl::Load() nUndoCount = nTemp; else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); } break; } default: - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); break; } } diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index a921ebae3a58..62461bd2d480 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -208,7 +208,7 @@ namespace utl // this should be unreachable: As long as we're a CloseListener, we veto the closing. If we're going // to close the component ourself, then we revoke ourself as listener *before* the close call. So, // if this here fires, something went definately wrong. - DBG_ERROR( "CloseableComponentImpl::notifyClosing: unreachable!" ); + OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" ); } //-------------------------------------------------------------------- @@ -219,7 +219,7 @@ namespace utl ) throw (RuntimeException) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" ); - DBG_ERROR( "CloseableComponentImpl::disposing: unreachable!" ); + OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" ); // same reasoning for this assertion as in ->notifyClosing } diff --git a/unotools/source/property/propertysethelper.cxx b/unotools/source/property/propertysethelper.cxx index 26901e2ca46e..8e884cffbbea 100644 --- a/unotools/source/property/propertysethelper.cxx +++ b/unotools/source/property/propertysethelper.cxx @@ -285,17 +285,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aProp void PropertySetHelper::_getPropertyStates( const utl::PropertyMapEntry** /*ppEntries*/, PropertyState* /*pStates*/ ) throw(UnknownPropertyException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); } void PropertySetHelper::_setPropertyToDefault( const utl::PropertyMapEntry* /*pEntry*/ ) throw(UnknownPropertyException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); } Any PropertySetHelper::_getPropertyDefault( const utl::PropertyMapEntry* /*pEntry*/ ) throw(UnknownPropertyException, WrappedTargetException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); Any aAny; return aAny; diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx index 06feee364746..295486d3bf4c 100644 --- a/unotools/source/property/propertysetinfo.cxx +++ b/unotools/source/property/propertysetinfo.cxx @@ -81,12 +81,12 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap ) throw() PropertyMap::iterator aIter = maPropertyMap.find( aName ); if( aIter != maPropertyMap.end() ) { - DBG_ERROR( "Warning: PropertyMapEntry added twice, possible error!" ); + OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!" ); } #endif if( NULL == pMap->mpType ) { - DBG_ERROR( "No type in PropertyMapEntry!" ); + OSL_FAIL( "No type in PropertyMapEntry!" ); pMap->mpType = &::getCppuType((const sal_Int32*)0); } diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 5439aacc256d..ac97a15f4b24 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1377,7 +1377,7 @@ void UcbLockBytes::terminate_Impl() if ( GetError() == ERRCODE_NONE && !m_xInputStream.is() ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); SetError( ERRCODE_IO_NOTEXISTS ); } @@ -1648,7 +1648,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); xLockBytes->SetError( ERRCODE_IO_GENERAL ); } @@ -1699,7 +1699,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); xLockBytes->SetError( ERRCODE_IO_GENERAL ); } diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 28d3fc0df71b..925dfa8c00b0 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -111,7 +111,7 @@ void SalData::ensureThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } @@ -135,7 +135,7 @@ void SalData::drainThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 570ba4ff3747..da5b92b7ff7f 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -246,7 +246,7 @@ BOOL ImplSVMainHook( int * pnInit ) } else { - DBG_ERROR( "NSApplication initialization could not be done" ); + OSL_FAIL( "NSApplication initialization could not be done" ); } return TRUE; // indicate that ImplSVMainHook is implemented @@ -667,7 +667,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; default: - DBG_ERROR( "unhandled NSApplicationDefined event" ); + OSL_FAIL( "unhandled NSApplicationDefined event" ); break; }; } diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index 3a37f6d32d39..2a531f243de2 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -265,7 +265,7 @@ bool AquaSalBitmap::AllocateUserData() case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break; case 32: mnBytesPerRow = mnWidth << 2; break; default: - DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); + OSL_FAIL("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); } } @@ -276,7 +276,7 @@ bool AquaSalBitmap::AllocateUserData() } catch( const std::bad_alloc& ) { - DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); + OSL_FAIL( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); maUserBuffer.reset( NULL ); mnBytesPerRow = 0; } diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 7b8e41584a30..cd32820f258c 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -443,17 +443,17 @@ void AquaSalGraphics::initResolution( NSWindow* pWin ) } else { - DBG_ERROR( "no resolution found in device description" ); + OSL_FAIL( "no resolution found in device description" ); } } else { - DBG_ERROR( "no device description" ); + OSL_FAIL( "no device description" ); } } else { - DBG_ERROR( "no screen found" ); + OSL_FAIL( "no screen found" ); } // #i107076# maintaining size-WYSIWYG-ness causes many problems for @@ -1269,7 +1269,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor ) { - DBG_ERROR("not implemented for color masking!"); + OSL_FAIL("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); } @@ -2416,7 +2416,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti else if( pFontData->IsEmbeddable() ) { // get individual character widths - DBG_ERROR("not implemented for non-subsettable fonts!\n"); + OSL_FAIL("not implemented for non-subsettable fonts!\n"); } } diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index de7cbcbf4d5e..3d6eba93a59b 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -152,7 +152,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 ); } else - DBG_ERROR( "no print info in SetupPrinterGraphics" ); + OSL_FAIL( "no print info in SetupPrinterGraphics" ); } } @@ -775,7 +775,7 @@ BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName, bool i_bDirect, ImplJobSetup* i_pSetupData ) { - DBG_ERROR( "should never be called" ); + OSL_FAIL( "should never be called" ); return FALSE; } diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index e280a583b3d5..ca99a2ca6a2d 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -848,7 +848,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const pCursor = GetSalData()->getCursor( mePointerStyle ); if( pCursor == nil ) { - DBG_ERROR( "unmapped cursor" ); + OSL_FAIL( "unmapped cursor" ); pCursor = [NSCursor arrowCursor]; } break; diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index df1de50d8709..a124201480b5 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -554,7 +554,7 @@ void AquaSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) maItems.insert( maItems.begin() + nPos, pAquaSalMenuItem ); else { - DBG_ERROR( "invalid item index in insert" ); + OSL_FAIL( "invalid item index in insert" ); return; } @@ -577,7 +577,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos ) } else { - DBG_ERROR( "invalid item index in remove" ); + OSL_FAIL( "invalid item index in remove" ); return; } @@ -800,7 +800,7 @@ void AquaSalMenu::statusLayout() if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is [(OOStatusItemView*)pView layout]; else - DBG_ERROR( "someone stole our status view" ); + OSL_FAIL( "someone stole our status view" ); } } diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index 7659ed1a0640..97271b6ecd5f 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -308,7 +308,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); + OSL_FAIL( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); } } } @@ -319,7 +319,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked in the main thread" ); + OSL_FAIL( "SolarMutex not locked in the main thread" ); } } } diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index ec8101d74315..46a32b699650 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1581,7 +1581,7 @@ Window* Application::GetDefDialogParent() // check for corrupted window hierarchy, #122232#, may be we now crash somewhere else if( !pWin->mpWindowImpl ) { - DBG_ERROR( "Window hierarchy corrupted!" ); + OSL_FAIL( "Window hierarchy corrupted!" ); pSVData->maWinData.mpFocusWin = NULL; // avoid further access return NULL; } diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 7749aa8ba0de..d83c11e4f270 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -319,7 +319,7 @@ void Timer::Start() } else if( !mpTimerData->mpSVTimer ) // TODO: remove when guilty found { - DBG_ERROR( "Timer::Start() on a destroyed Timer!" ); + OSL_FAIL( "Timer::Start() on a destroyed Timer!" ); } else { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index fd6f24c90bfb..962ad4553a29 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2901,7 +2901,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize } else { - DBG_ERROR( "RadioButton::Draw() - not implemented for RadioButton with Image" ); + OSL_FAIL( "RadioButton::Draw() - not implemented for RadioButton with Image" ); } } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 1f0f7af61a92..4fffe2f277ca 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -1212,7 +1212,7 @@ static FieldUnit ImplMap2FieldUnit( MapUnit meUnit, long& nDecDigits ) case MAP_TWIP : return FUNIT_TWIP; default: - DBG_ERROR( "default eInUnit" ); + OSL_FAIL( "default eInUnit" ); break; } return FUNIT_NONE; @@ -1326,7 +1326,7 @@ double MetricField::ConvertDoubleValue( double nValue, USHORT nDigits, eInUnit == MAP_APPFONT || eInUnit == MAP_RELATIVE ) { - DBG_ERROR( "invalid parameters" ); + OSL_FAIL( "invalid parameters" ); return nValue; } @@ -1383,7 +1383,7 @@ double MetricField::ConvertDoubleValue( double nValue, USHORT nDigits, eOutUnit == MAP_APPFONT || eOutUnit == MAP_RELATIVE ) { - DBG_ERROR( "invalid parameters" ); + OSL_FAIL( "invalid parameters" ); return nValue; } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index a01be7411c18..bd6eec0029e8 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1298,7 +1298,7 @@ static BOOL ImplDateGetValue( const XubString& rStr, Date& rDate, ExtDateFieldFo default: { - DBG_ERROR( "DateFormat???" ); + OSL_FAIL( "DateFormat???" ); } } } @@ -1434,7 +1434,7 @@ XubString DateFormatter::ImplGetDateAsText( const Date& rDate, break; default: { - DBG_ERROR( "DateFormat???" ); + OSL_FAIL( "DateFormat???" ); } } @@ -1607,7 +1607,7 @@ void DateField::ImplDateSpinArea( BOOL bUp ) } break; default: - DBG_ERROR( "invalid conversion" ); + OSL_FAIL( "invalid conversion" ); break; } } @@ -3300,7 +3300,7 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) SetFormat( TIMEF_SEC ); } break; - default: DBG_ERROR( "ExtTimeFieldFormat unknown!" ); + default: OSL_FAIL( "ExtTimeFieldFormat unknown!" ); } if ( GetField() && GetField()->GetText().Len() ) diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index b492033d078e..889d46efe373 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -116,7 +116,7 @@ bool FontSubsetInfo::CreateFontSubset( case NO_FONT: // fall trough default: - DBG_ERROR( "unhandled type in CreateFontSubset()"); + OSL_FAIL( "unhandled type in CreateFontSubset()"); break; } diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index a1f902ed9365..8d13cdb41a0f 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -221,7 +221,7 @@ const BitmapPalette& Bitmap::GetGreyPalette( int nEntries ) } else { - DBG_ERROR( "Bitmap::GetGreyPalette: invalid entry count (2/4/16/256 allowed)" ); + OSL_FAIL( "Bitmap::GetGreyPalette: invalid entry count (2/4/16/256 allowed)" ); return aGreyPalette2; } } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 82b9c81ba97e..f246ecd31058 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -354,7 +354,7 @@ BOOL Bitmap::Convert( BmpConversion eConversion ) break; default: - DBG_ERROR( "Bitmap::Convert(): Unsupported conversion" ); + OSL_FAIL( "Bitmap::Convert(): Unsupported conversion" ); break; } @@ -1841,7 +1841,7 @@ BOOL Bitmap::ImplReduceMedian( USHORT nColCount ) nBitCount = 8; else { - DBG_ERROR( "Bitmap::ImplReduceMedian(): invalid color count!" ); + OSL_FAIL( "Bitmap::ImplReduceMedian(): invalid color count!" ); nBitCount = 8; nColCount = 256; } diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 1f18b9375ea9..4411b5def4ce 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -98,7 +98,7 @@ BOOL Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, cons break; default: - DBG_ERROR( "Bitmap::Convert(): Unsupported filter" ); + OSL_FAIL( "Bitmap::Convert(): Unsupported filter" ); break; } diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 51b27501ddc6..e3a1eb37fa98 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -250,7 +250,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits() default: { - DBG_ERROR( "BitmapWriteAccess::ZeroInitUnusedBits: Unsupported pixel format"); + OSL_FAIL( "BitmapWriteAccess::ZeroInitUnusedBits: Unsupported pixel format"); nBits = 0; bMsb = true; } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 59757228be9e..df6dcd58545f 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -943,7 +943,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) } #ifdef DBG_UTIL else - DBG_ERROR("More than one DX array element missing on SVM import"); + OSL_FAIL("More than one DX array element missing on SVM import"); #endif } } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 371571578dad..f476fa8e8452 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1627,7 +1627,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_TEXTRECT_ACTION ): case( META_MOVECLIPREGION_ACTION ): { - DBG_ERROR( "GDIMetaFile::Rotate(): unsupported action" ); + OSL_FAIL( "GDIMetaFile::Rotate(): unsupported action" ); } break; @@ -2331,7 +2331,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol case( META_BMPEX_ACTION ): case( META_MASK_ACTION ): { - DBG_ERROR( "Don't use bitmap actions of this type in metafiles!" ); + OSL_FAIL( "Don't use bitmap actions of this type in metafiles!" ); } break; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 3edf63925c9e..08533663c562 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -52,7 +52,7 @@ static ::rtl::OString polyToString( const Polygon& rPoly ) break; default: - DBG_ERROR( "SvtGraphicStroke::polyToString invalid flag"); + OSL_FAIL( "SvtGraphicStroke::polyToString invalid flag"); break; } aStr += ::rtl::OString::valueOf( static_cast< double >( rPoly[nVertex].getX() ) ); @@ -227,7 +227,7 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing cap type"); + OSL_FAIL( "SvtGraphicStroke::toString missing cap type"); break; } aStr += " join: "; @@ -250,7 +250,7 @@ void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing join type"); + OSL_FAIL( "SvtGraphicStroke::toString missing join type"); break; } aStr += " "; @@ -515,7 +515,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicFill::toString missing fill rule"); + OSL_FAIL( "SvtGraphicFill::toString missing fill rule"); break; } aStr += " type: "; @@ -538,7 +538,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing fill type"); + OSL_FAIL( "SvtGraphicStroke::toString missing fill type"); break; } @@ -564,7 +564,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing hatch type"); + OSL_FAIL( "SvtGraphicStroke::toString missing hatch type"); break; } @@ -587,7 +587,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing gradient type"); + OSL_FAIL( "SvtGraphicStroke::toString missing gradient type"); break; } @@ -618,7 +618,7 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const break; default: - DBG_ERROR( "SvtGraphicStroke::toString missing graphic type"); + OSL_FAIL( "SvtGraphicStroke::toString missing graphic type"); break; } diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index be9e3fd74307..d33f58d3ef14 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -279,7 +279,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } break; default: - DBG_ERROR( "unhandled MapUnit" ); + OSL_FAIL( "unhandled MapUnit" ); break; } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 97b6ae716de8..6afa91f16c73 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2427,7 +2427,7 @@ void PDFWriterImpl::endPage() // sanity check if( m_aOutputStreams.begin() != m_aOutputStreams.end() ) { - DBG_ERROR( "redirection across pages !!!" ); + OSL_FAIL( "redirection across pages !!!" ); m_aOutputStreams.clear(); // leak ! m_aMapMode.SetOrigin( Point() ); } @@ -2678,7 +2678,7 @@ OString PDFWriterImpl::emitStructureAttributes( PDFStructureElement& i_rEle ) } else { - DBG_ERROR( "unresolved link id for Link structure" ); + OSL_FAIL( "unresolved link id for Link structure" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "unresolved link id %" SAL_PRIdINT32 " for Link structure\n", nLink ); { @@ -2779,7 +2779,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) emitStructure( rChild ); else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure element" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure element" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::emitStructure: invalid child structure elemnt with id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -2788,7 +2788,7 @@ sal_Int32 PDFWriterImpl::emitStructure( PDFStructureElement& rEle ) } else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure id" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure id" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::emitStructure: invalid child structure id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -3120,7 +3120,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa } else { - DBG_ERROR( "system font neither embeddable nor subsettable" ); + OSL_FAIL( "system font neither embeddable nor subsettable" ); } // write font descriptor @@ -3956,7 +3956,7 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const ImplFontData* pFont, FontSubs case FontSubsetInfo::ANY_TYPE1: break; default: - DBG_ERROR( "unknown fonttype in PDF font descriptor" ); + OSL_FAIL( "unknown fonttype in PDF font descriptor" ); return 0; } aLine.append( ' ' ); @@ -4031,7 +4031,7 @@ bool PDFWriterImpl::emitFonts() nGlyphs++; else { - DBG_ERROR( "too many glyphs for subset" ); + OSL_FAIL( "too many glyphs for subset" ); } } FontSubsetInfo aSubsetInfo; @@ -4092,7 +4092,7 @@ bool PDFWriterImpl::emitFonts() else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 ) { // TODO: implement - DBG_ERROR( "PDFWriterImpl does not support CFF-font subsets yet!" ); + OSL_FAIL( "PDFWriterImpl does not support CFF-font subsets yet!" ); } else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA? { @@ -11010,11 +11010,11 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, DBG_ASSERT( 0, "Structure element inserted to StructTreeRoot that is not a document" ); } else { - DBG_ERROR( "document structure in disorder !" ); + OSL_FAIL( "document structure in disorder !" ); } } else { - DBG_ERROR( "PDF document structure MUST be contained in a Document element" ); + OSL_FAIL( "PDF document structure MUST be contained in a Document element" ); } } @@ -11132,7 +11132,7 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle ) addInternalStructureContainer( rChild );//examine the child else { - DBG_ERROR( "PDFWriterImpl::addInternalStructureContainer: invalid child structure element" ); + OSL_FAIL( "PDFWriterImpl::addInternalStructureContainer: invalid child structure element" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::addInternalStructureContainer: invalid child structure elemnt with id %" SAL_PRIdINT32 "\n", *it ); #endif @@ -11141,7 +11141,7 @@ void PDFWriterImpl::addInternalStructureContainer( PDFStructureElement& rEle ) } else { - DBG_ERROR( "PDFWriterImpl::emitStructure: invalid child structure id" ); + OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure id" ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "PDFWriterImpl::addInternalStructureContainer: invalid child structure id %" SAL_PRIdINT32 "\n", *it ); #endif diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index b5f9e08daa81..c8be71b70a45 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -202,7 +202,7 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, case META_TRANSPARENT_ACTION: default: - DBG_ERROR("Printer::GetPreparedMetafile impossible state reached"); + OSL_FAIL("Printer::GetPreparedMetafile impossible state reached"); break; } @@ -267,7 +267,7 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, aBmp )); break; default: - DBG_ERROR("Unexpected case"); + OSL_FAIL("Unexpected case"); break; } } @@ -605,7 +605,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic break; case META_TEXTLINE_ACTION: - DBG_ERROR("META_TEXTLINE_ACTION not supported"); + OSL_FAIL("META_TEXTLINE_ACTION not supported"); break; default: diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index ed58a5d90ade..a00795e2e2ce 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -656,7 +656,7 @@ BOOL ImplRegion::InsertPoint( const Point &rPoint, long nLineID, mpLastCheckedBand = mpLastCheckedBand->mpNextBand; } - DBG_ERROR( "ImplRegion::InsertPoint reached the end of the list!" ); + OSL_FAIL( "ImplRegion::InsertPoint reached the end of the list!" ); } else { @@ -673,10 +673,10 @@ BOOL ImplRegion::InsertPoint( const Point &rPoint, long nLineID, mpLastCheckedBand = mpLastCheckedBand->mpPrevBand; } - DBG_ERROR( "ImplRegion::InsertPoint reached the beginning of the list!" ); + OSL_FAIL( "ImplRegion::InsertPoint reached the beginning of the list!" ); } - DBG_ERROR( "ImplRegion::InsertPoint point not inserted!" ); + OSL_FAIL( "ImplRegion::InsertPoint point not inserted!" ); // reinitialize pointer (should never be reached!) mpLastCheckedBand = mpFirstBand; @@ -889,7 +889,7 @@ void ImplRegion::Union( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::Union() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::Union() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -926,7 +926,7 @@ void ImplRegion::Exclude( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::Exclude() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::Exclude() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -963,7 +963,7 @@ void ImplRegion::XOr( long nLeft, long nTop, long nRight, long nBottom ) { if ( (pBand->mnYTop < nCurY) || (pBand->mnYBottom < nCurY) ) { - DBG_ERROR( "ImplRegion::XOr() - Bands not sorted!" ); + OSL_FAIL( "ImplRegion::XOr() - Bands not sorted!" ); } pBand = pBand->mpNextBand; } @@ -1054,12 +1054,12 @@ BOOL ImplRegion::OptimizeBandList() "Exiting ImplRegion::OptimizeBandList(): empty band in region!" ); if ( pBand->mnYBottom < pBand->mnYTop ) - DBG_ERROR( "ImplRegion::OptimizeBandList(): YBottomBoundary < YTopBoundary" ); + OSL_FAIL( "ImplRegion::OptimizeBandList(): YBottomBoundary < YTopBoundary" ); if ( pBand->mpNextBand ) { if ( pBand->mnYBottom >= pBand->mpNextBand->mnYTop ) - DBG_ERROR( "ImplRegion::OptimizeBandList(): overlapping bands in region!" ); + OSL_FAIL( "ImplRegion::OptimizeBandList(): overlapping bands in region!" ); } pBand = pBand->mpNextBand; @@ -2477,7 +2477,7 @@ SvStream& operator>>( SvStream& rIStrm, Region& rRegion ) if( rIStrm.IsEof() ) { - DBG_ERROR( "premature end of region stream" ); + OSL_FAIL( "premature end of region stream" ); delete rRegion.mpImplRegion; rRegion.mpImplRegion = (ImplRegion*)&aImplEmptyRegion; return rIStrm; diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 3f2dcd1f384c..293098496d15 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -326,7 +326,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec // initialize pFncGetPixel to something valid that is // least likely to crash pFncGetPixel = BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL; - DBG_ERROR( "unknown read format" ); + OSL_FAIL( "unknown read format" ); break; } @@ -357,7 +357,7 @@ BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRec // least likely to crash pFncSetPixel = BitmapReadAccess::SetPixelFor_1BIT_MSB_PAL; pDstBuffer->mnBitCount = 1; - DBG_ERROR( "unknown write format" ); + OSL_FAIL( "unknown write format" ); break; } diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 3e2d839093bc..fc15cc77dcce 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -368,7 +368,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : break; default: - DBG_ERROR( "unsupported bitmap format" ); + OSL_FAIL( "unsupported bitmap format" ); break; } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index f6b0d2deead0..c78a1eb13f6a 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -263,7 +263,7 @@ void Accelerator::ImplInsertAccel( USHORT nItemId, const KeyCode& rKeyCode, ULONG nCode = rKeyCode.GetFullKeyCode(); if ( !nCode ) { - DBG_ERROR( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); + OSL_FAIL( "Accelerator::InsertItem(): KeyCode with KeyCode 0 not allowed" ); delete pEntry; } else if ( !mpData->maKeyTable.Insert( nCode, pEntry ) ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d6da6ad37237..b50fd4f17a9a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -722,7 +722,7 @@ short Dialog::Execute() if( ! aParentDelData.IsDelete() ) pDialogParent->ImplRemoveDel( &aParentDelData ); else - DBG_ERROR( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); + OSL_FAIL( "Dialog::Execute() - Parent of dialog destroyed in Execute()" ); } #endif if ( !aDelData.IsDelete() ) @@ -730,7 +730,7 @@ short Dialog::Execute() #ifdef DBG_UTIL else { - DBG_ERROR( "Dialog::Execute() - Dialog destroyed in Execute()" ); + OSL_FAIL( "Dialog::Execute() - Dialog destroyed in Execute()" ); } #endif diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 4b3b0ec72174..4932b689a9c2 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1540,7 +1540,7 @@ void PrintDialog::setupOptionalUI() } else { - DBG_ERROR( "Unsupported UI option" ); + OSL_FAIL( "Unsupported UI option" ); } pCurColumn = pSaveCurColumn; @@ -2169,7 +2169,7 @@ PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const } else { - DBG_ERROR( "changed control not in property map" ); + OSL_FAIL( "changed control not in property map" ); } return pVal; } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a230b17d50e1..d8698966d14e 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1125,7 +1125,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec mbHorz = TRUE; } else { - DBG_ERROR( "ImplLineSizing: Trailing else" ); + OSL_FAIL( "ImplLineSizing: Trailing else" ); nCurSize = 0; mbHorz = FALSE; } diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 8b7296e9a777..da042c00bdfc 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -204,7 +204,7 @@ void GtkSalDisplay::screenSizeChanged( GdkScreen* pScreen ) } else { - DBG_ERROR( "unknown screen changed size" ); + OSL_FAIL( "unknown screen changed size" ); } } } @@ -233,7 +233,7 @@ void GtkSalDisplay::monitorsChanged( GdkScreen* pScreen ) } else { - DBG_ERROR( "monitors for non-default screen changed, extend-me" ); + OSL_FAIL( "monitors for non-default screen changed, extend-me" ); } } } diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 7e7d0e2c6f8c..776e90d8daff 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1142,7 +1142,7 @@ void GtkSalFrame::SetIcon( USHORT nIcon ) aMask = AlphaMask( aIcon.GetMask() ); break; default: - DBG_ERROR( "unhandled transparent type" ); + OSL_FAIL( "unhandled transparent type" ); break; } } diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx index 55af58700a85..cc3d4a1b0726 100644 --- a/vcl/unx/headless/svpelement.cxx +++ b/vcl/unx/headless/svpelement.cxx @@ -283,7 +283,7 @@ sal_uInt32 SvpElement::getBitCountFromScanlineFormat( sal_Int32 nFormat ) nBitCount = 32; break; default: - DBG_ERROR( "unsupported basebmp format" ); + OSL_FAIL( "unsupported basebmp format" ); break; } return nBitCount; diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 1c803b58f913..cc2e2c9e20ac 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -372,7 +372,7 @@ BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pP void PspGraphics::copyBits( const SalTwoRect* /*pPosAry*/, SalGraphics* /*pSSrcGraphics*/ ) { - DBG_ERROR( "Error: PrinterGfx::CopyBits() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyBits() not implemented" ); } void PspGraphics::copyArea ( long /*nDestX*/, long /*nDestY*/, @@ -380,7 +380,7 @@ void PspGraphics::copyArea ( long /*nDestX*/, long /*nDestY*/, long /*nSrcWidth*/, long /*nSrcHeight*/, USHORT /*nFlags*/ ) { - DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyArea() not implemented" ); } void PspGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) @@ -402,21 +402,21 @@ void PspGraphics::drawBitmap( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, const SalBitmap& /*rTransBitmap*/ ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); } void PspGraphics::drawBitmap( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, SalColor /*nTransparentColor*/ ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent color"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color"); } void PspGraphics::drawMask( const SalTwoRect* /*pPosAry*/, const SalBitmap& /*rSalBitmap*/, SalColor /*nMaskColor*/ ) { - DBG_ERROR("Error: PrinterGfx::DrawMask() not implemented"); + OSL_FAIL("Error: PrinterGfx::DrawMask() not implemented"); } SalBitmap* PspGraphics::getBitmap( long /*nX*/, long /*nY*/, long /*nDX*/, long /*nDY*/ ) @@ -427,7 +427,7 @@ SalBitmap* PspGraphics::getBitmap( long /*nX*/, long /*nY*/, long /*nDX*/, long SalColor PspGraphics::getPixel( long /*nX*/, long /*nY*/ ) { - DBG_ERROR ("Warning: PrinterGfx::GetPixel() not implemented"); + OSL_FAIL("Warning: PrinterGfx::GetPixel() not implemented"); return 0; } @@ -438,7 +438,7 @@ void PspGraphics::invert( long /*nDY*/, SalInvert /*nFlags*/ ) { - DBG_ERROR ("Warning: PrinterGfx::Invert() not implemented"); + OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } //========================================================================== diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index 6a4685165749..07e6497d839a 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -118,7 +118,7 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont, bFound = rServerFont.GetGlyphBitmap8( nGlyphIndex, pGcpHelper->maRawBitmap ); break; default: - DBG_ERROR( "SVP GCP::GetGlyphBmp(): illegal scanline format"); + OSL_FAIL( "SVP GCP::GetGlyphBmp(): illegal scanline format"); // fall back to black&white mask nBmpFormat = Format::ONE_BIT_LSB_GREY; bFound = false; diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index d85b100bcf0e..4bc379846edf 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2190,7 +2190,7 @@ XLIB_Cursor SalDisplay::GetPointer( int ePointerStyle ) break; default: - DBG_ERROR("pointer not implemented"); + OSL_FAIL("pointer not implemented"); aCur = XCreateFontCursor( pDisp_, XC_arrow ); break; } @@ -2802,7 +2802,7 @@ void SalDisplay::deregisterFrame( SalFrame* pFrame ) osl_releaseMutex( hEventGuard_ ); } else { - DBG_ERROR( "SalDisplay::deregisterFrame !acquireMutex\n" ); + OSL_FAIL( "SalDisplay::deregisterFrame !acquireMutex\n" ); } m_aFrames.remove( pFrame ); diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index 6eb3c5216e02..bdccf4a82e01 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -145,7 +145,7 @@ SalPrinterBmp::SalPrinterBmp (BitmapBuffer* pBuffer) : mpFncGetPixel = BitmapReadAccess::GetPixelFor_32BIT_TC_MASK; break; default: - DBG_ERROR("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format"); + OSL_FAIL("Error: SalPrinterBmp::SalPrinterBmp() unknown bitmap format"); break; } } @@ -190,7 +190,7 @@ SalPrinterBmp::GetDepth () const default: nDepth = 1; - DBG_ERROR ("Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()"); + OSL_FAIL("Error: unsupported bitmap depth in SalPrinterBmp::GetDepth()"); break; } @@ -448,12 +448,12 @@ BOOL PspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pP void PspGraphics::copyBits( const SalTwoRect*, SalGraphics* ) { - DBG_ERROR( "Error: PrinterGfx::CopyBits() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyBits() not implemented" ); } void PspGraphics::copyArea ( long,long,long,long,long,long,USHORT ) { - DBG_ERROR( "Error: PrinterGfx::CopyArea() not implemented" ); + OSL_FAIL( "Error: PrinterGfx::CopyArea() not implemented" ); } void PspGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) @@ -475,21 +475,21 @@ void PspGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, const SalBitmap& ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); } void PspGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, SalColor ) { - DBG_ERROR("Error: no PrinterGfx::DrawBitmap() for transparent color"); + OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color"); } void PspGraphics::drawMask( const SalTwoRect*, const SalBitmap &, SalColor ) { - DBG_ERROR("Error: PrinterGfx::DrawMask() not implemented"); + OSL_FAIL("Error: PrinterGfx::DrawMask() not implemented"); } SalBitmap* PspGraphics::getBitmap( long, long, long, long ) @@ -500,13 +500,13 @@ SalBitmap* PspGraphics::getBitmap( long, long, long, long ) SalColor PspGraphics::getPixel( long, long ) { - DBG_ERROR ("Warning: PrinterGfx::GetPixel() not implemented"); + OSL_FAIL("Warning: PrinterGfx::GetPixel() not implemented"); return 0; } void PspGraphics::invert(long,long,long,long,SalInvert) { - DBG_ERROR ("Warning: PrinterGfx::Invert() not implemented"); + OSL_FAIL("Warning: PrinterGfx::Invert() not implemented"); } //========================================================================== @@ -1202,7 +1202,7 @@ FontWidth PspGraphics::ToFontWidth (psp::width::type eWidth) case psp::width::UltraExpanded: return WIDTH_ULTRA_EXPANDED; case psp::width::Unknown: return WIDTH_DONTKNOW; default: - DBG_ERROR( "unknown width mapping" ); + OSL_FAIL( "unknown width mapping" ); break; } return WIDTH_DONTKNOW; @@ -1224,7 +1224,7 @@ FontWeight PspGraphics::ToFontWeight (psp::weight::type eWeight) case psp::weight::Black: return WEIGHT_BLACK; case psp::weight::Unknown: return WEIGHT_DONTKNOW; default: - DBG_ERROR( "unknown weight mapping" ); + OSL_FAIL( "unknown weight mapping" ); break; } return WEIGHT_DONTKNOW; @@ -1238,7 +1238,7 @@ FontPitch PspGraphics::ToFontPitch (psp::pitch::type ePitch) case psp::pitch::Variable: return PITCH_VARIABLE; case psp::pitch::Unknown: return PITCH_DONTKNOW; default: - DBG_ERROR( "unknown pitch mapping" ); + OSL_FAIL( "unknown pitch mapping" ); break; } return PITCH_DONTKNOW; @@ -1253,7 +1253,7 @@ FontItalic PspGraphics::ToFontItalic (psp::italic::type eItalic) case psp::italic::Italic: return ITALIC_NORMAL; case psp::italic::Unknown: return ITALIC_DONTKNOW; default: - DBG_ERROR( "unknown italic mapping" ); + OSL_FAIL( "unknown italic mapping" ); break; } return ITALIC_DONTKNOW; @@ -1271,7 +1271,7 @@ FontFamily PspGraphics::ToFontFamily (psp::family::type eFamily) case psp::family::System: return FAMILY_SYSTEM; case psp::family::Unknown: return FAMILY_DONTKNOW; default: - DBG_ERROR( "unknown family mapping" ); + OSL_FAIL( "unknown family mapping" ); break; } return FAMILY_DONTKNOW; diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx index 30094d46be52..7e8b4abc5905 100644 --- a/vcl/unx/source/gdi/salgdi2.cxx +++ b/vcl/unx/source/gdi/salgdi2.cxx @@ -927,7 +927,7 @@ void X11SalGraphics::drawBitmap( const SalTwoRect*, const SalBitmap&, SalColor ) { - DBG_ERROR( "::DrawBitmap with transparent color not supported" ); + OSL_FAIL( "::DrawBitmap with transparent color not supported" ); } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx index 6e926087f881..14d3a98d69b2 100644 --- a/vcl/unx/source/printergfx/common_gfx.cxx +++ b/vcl/unx/source/printergfx/common_gfx.cxx @@ -566,7 +566,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BY } else { - DBG_ERROR( "PrinterGfx::DrawPolyLineBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolyLineBezier: Strange output" ); } i+=3; } @@ -612,7 +612,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYT } else { - DBG_ERROR( "PrinterGfx::DrawPolygonBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolygonBezier: Strange output" ); } i+=3; } @@ -676,7 +676,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints, } else { - DBG_ERROR( "PrinterGfx::DrawPolyPolygonBezier: Strange output" ); + OSL_FAIL( "PrinterGfx::DrawPolyPolygonBezier: Strange output" ); } j+=3; } @@ -999,7 +999,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, case 4: cCmd |= 0x01; break; case 6: cCmd |= 0x02; break; case 8: cCmd |= 0x03; break; - default: DBG_ERROR ("invalid x precision in binary path"); + default: OSL_FAIL("invalid x precision in binary path"); } switch (nXPrec) { @@ -1007,7 +1007,7 @@ PrinterGfx::PSBinPath (const Point& rCurrent, Point& rOld, case 4: cCmd |= 0x04; break; case 6: cCmd |= 0x08; break; case 8: cCmd |= 0x0c; break; - default: DBG_ERROR ("invalid y precision in binary path"); + default: OSL_FAIL("invalid y precision in binary path"); } cCmd += 'A'; pPath[0] = cCmd; diff --git a/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/source/printergfx/psputil.cxx index 3fe106221ad2..9a5de44960e6 100644 --- a/vcl/unx/source/printergfx/psputil.cxx +++ b/vcl/unx/source/printergfx/psputil.cxx @@ -95,7 +95,7 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer) case '5' : pBuffer[0] = 'D'; break; case '6' : pBuffer[0] = 'E'; break; case '7' : pBuffer[0] = 'F'; break; - default: DBG_ERROR("Already a signed value"); + default: OSL_FAIL("Already a signed value"); } } diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d69337bf356d..0ecda3dc2427 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -340,7 +340,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); + OSL_FAIL( "SolarMutex not locked, and not thread save code in VCL is called from outside of the main thread" ); } } } @@ -351,7 +351,7 @@ void ImplDbgTestSolarMutex() SalYieldMutex* pYieldMutex = pSalData->mpFirstInstance->mpSalYieldMutex; if ( pYieldMutex->mnThreadId != nCurThreadId ) { - DBG_ERROR( "SolarMutex not locked in the main thread" ); + OSL_FAIL( "SolarMutex not locked in the main thread" ); } } } |