diff options
Diffstat (limited to 'cppu/source/uno')
| -rw-r--r-- | cppu/source/uno/copy.hxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/data.cxx | 2 | ||||
| -rw-r--r-- | cppu/source/uno/destr.hxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 7 | ||||
| -rw-r--r-- | cppu/source/uno/sequence.cxx | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 7750a686b694..eee6363e6998 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -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; } diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 7ba327b9f8b3..f9b1903851c4 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -118,7 +118,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 ); } diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 0dc28386afed..ce64f2d82e7f 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -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: diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 2cd834cec65b..71cda7fe7e40 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -270,7 +270,7 @@ static void SAL_CALL defenv_registerInterface( // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( - that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); + that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) ); if (insertion.second) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); @@ -318,7 +318,7 @@ static void SAL_CALL defenv_registerProxyInterface( // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( - that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); + that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) ); if (insertion.second) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); @@ -687,8 +687,7 @@ static void writeLine( } else { - OSL_TRACE( pLine ); - OSL_TRACE( "\n" ); + OSL_TRACE( "%s\n", pLine ); } } } diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 947e803cb76a..6374c773cb86 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -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; } |