summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-01 19:07:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-02 15:04:37 +0100
commit65c053ca1a5a8c7318ab1e42cdde2d540a283673 (patch)
tree2e1a29f5d832ff0cb0d4c095f038392b472459d1 /idl
parent40afe52c92f340d0fedbb59d1071a542e6fb61e3 (diff)
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/basobj.cxx6
-rw-r--r--idl/source/objects/bastype.cxx2
-rw-r--r--idl/source/objects/object.cxx14
-rw-r--r--idl/source/objects/slot.cxx4
-rw-r--r--idl/source/objects/types.cxx6
5 files changed, 16 insertions, 16 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 11d57095dce7..6c87ed895ea2 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -146,7 +146,7 @@ void SvMetaName::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aName;
@@ -429,7 +429,7 @@ void SvMetaReference::Load( SvPersistStream & rStm )
if( nMask >= 0x2 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 )
@@ -472,7 +472,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> pModule;
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 0ebadc98c7bb..97dac4b46534 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -98,7 +98,7 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
if( n & ~0x03 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "format error" );
+ OSL_FAIL( "format error" );
}
return rStm;
}
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 0cb39c367122..3b7f4583081a 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -51,7 +51,7 @@ void SvClassElement::Load( SvPersistStream & rStm )
if( nMask >= 0x08 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aAutomation;
@@ -94,7 +94,7 @@ void SvMetaClass::Load( SvPersistStream & rStm )
if( nMask >= 0x20 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aAttrList;
@@ -324,7 +324,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
{
if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) )
{
- DBG_ERROR( "Neuer Slot : " );
+ OSL_FAIL( "Neuer Slot : " );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
}
@@ -336,7 +336,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
// values have to match
if( pS->GetSlotId().GetValue() != rAttr.GetSlotId().GetValue() )
{
- DBG_ERROR( "Gleicher Name in MetaClass : " );
+ OSL_FAIL( "Gleicher Name in MetaClass : " );
DBG_ERROR( pS->GetName().GetBuffer() );
DBG_ERROR( pS->GetSlotId().GetBuffer() );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
@@ -355,7 +355,7 @@ BOOL SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
UINT32 nId2 = rAttr.GetSlotId().GetValue();
if( nId1 == nId2 && nId1 != 0 )
{
- DBG_ERROR( "Gleiche Id in MetaClass : " );
+ OSL_FAIL( "Gleiche Id in MetaClass : " );
DBG_ERROR( ByteString::CreateFromInt32( pS->GetSlotId().GetValue() ).GetBuffer() );
DBG_ERROR( pS->GetSlotId().GetBuffer() );
DBG_ERROR( rAttr.GetSlotId().GetBuffer() );
@@ -397,13 +397,13 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
{
case WRITE_ODL:
{
- DBG_ERROR( "Not supported anymore!" );
+ OSL_FAIL( "Not supported anymore!" );
break;
}
case WRITE_C_SOURCE:
case WRITE_C_HEADER:
{
- DBG_ERROR( "Not supported anymore!" );
+ OSL_FAIL( "Not supported anymore!" );
break;
}
case WRITE_DOCU:
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index bbb34593423a..fa1d3c6a659c 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -868,7 +868,7 @@ BOOL SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
// names may differ, because explicitly given
if ( pKnownSlot->GetName() != GetName() )
{
- DBG_ERROR("Illegal definition!");
+ OSL_FAIL("Illegal definition!");
rInStm.Seek( nTokPos );
return FALSE;
}
@@ -1022,7 +1022,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const ByteString & rPrefix,
if ( m == rBase.GetAttrList().Count() )
{
- DBG_ERROR("Invalid EnumSlot!");
+ OSL_FAIL("Invalid EnumSlot!");
xEnumSlot = Clone();
ULONG nValue;
if ( rBase.FindId(aSId , &nValue) )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 0537b69c3d66..2d6f8d746447 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -376,7 +376,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
pBaseType->GetType() == TYPE_STRUCT ||
pBaseType->GetType() == TYPE_ENUM )
{
- DBG_ERROR( "Falscher Parametertyp!" );
+ OSL_FAIL( "Falscher Parametertyp!" );
}
else
rOutStm << pBaseType->GetBasicPostfix().GetBuffer();
@@ -1784,7 +1784,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm )
if( nMask >= 0x02 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue );
@@ -1842,7 +1842,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm )
if( nMask >= 0x04 )
{
rStm.SetError( SVSTREAM_FILEFORMAT_ERROR );
- DBG_ERROR( "wrong format" );
+ OSL_FAIL( "wrong format" );
return;
}
if( nMask & 0x01 ) rStm >> aEnumValueList;