mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move OSL_ENSURE(0,...) to OSL_FAIL(...)

Browse Source
This commit is contained in:
Thomas Arnhold
2011-03-12 12:10:42 +01:00
parent 629b05ac30
commit adc6fe00e3
50 changed files with 125 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppu/source/uno/copy.hxx
View File

@@ -252,7 +252,7 @@ inline void _copyConstructAnyFromData(
*(typelib_TypeDescriptionReference **)&pDestAny->pReserved = *(typelib_TypeDescriptionReference **)pSource;
break;
case typelib_TypeClass_ANY:
OSL_ENSURE( 0, "### unexpected nested any!" );
OSL_FAIL( "### unexpected nested any!" );
break;
case typelib_TypeClass_ENUM:
pDestAny->pData = &pDestAny->pReserved;
@@ -729,7 +729,7 @@ inline uno_Sequence * icopyConstructSequence(
break;
}
default:
OSL_ENSURE( 0, "### unexepcted sequence element type!" );
OSL_FAIL( "### unexepcted sequence element type!" );
pDest = 0;
break;
}

2
cppu/source/uno/data.cxx
View File

@@ -115,7 +115,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p
buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) );
OString cstr(
OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
OSL_ENSURE( 0, cstr.getStr() );
OSL_FAIL( cstr.getStr() );
#endif
uno_any_destruct( pExc, 0 );
}

4
cppu/source/uno/destr.hxx
View File

@@ -152,7 +152,7 @@ inline void _destructAny(
::rtl_freeMemory( pAny->pData );
break;
case typelib_TypeClass_TYPEDEF:
OSL_ENSURE( 0, "### unexpected typedef!" );
OSL_FAIL( "### unexpected typedef!" );
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
@@ -381,7 +381,7 @@ inline void _destructData(
_destructAny( (uno_Any *)pValue, release );
break;
case typelib_TypeClass_TYPEDEF:
OSL_ENSURE( 0, "### unexpected typedef!" );
OSL_FAIL( "### unexpected typedef!" );
break;
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:

4
cppu/source/uno/sequence.cxx
View File

@@ -351,7 +351,7 @@ static inline bool idefaultConstructElements(
}
break;
default:
OSL_ENSURE( 0, "### unexpected element type!" );
OSL_FAIL( "### unexpected element type!" );
pSeq = 0;
break;
}
@@ -665,7 +665,7 @@ static inline bool icopyConstructFromElements(
break;
}
default:
OSL_ENSURE( 0, "### unexpected element type!" );
OSL_FAIL( "### unexpected element type!" );
pSeq = 0;
break;
}