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 /sot | |
parent | 7b981b7cab15e0fc2ebb159df2d40c3a2499b265 (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'sot')
-rw-r--r-- | sot/source/base/factory.cxx | 2 | ||||
-rw-r--r-- | sot/source/base/object.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stg.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgio.cxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/storage.cxx | 8 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 26 |
6 files changed, 21 insertions, 21 deletions
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 |