diff options
Diffstat (limited to 'bridges/source')
71 files changed, 117 insertions, 117 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx index 9d94992ff7c4..1a57355f4890 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx @@ -160,7 +160,7 @@ void cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case no exception occured... + // in case no exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -179,7 +179,7 @@ void cpp2uno_call( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx index e0776c19476c..8f13ad0d8654 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx @@ -334,7 +334,7 @@ void cc50_solaris_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cp OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif bridges::cpp_uno::shared::ArrayPointer< unsigned char > thunkPtr( new unsigned char[24]); @@ -435,7 +435,7 @@ void cc50_solaris_intel_fillUnoException( } #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "> c++ exception occured: %s\n", + fprintf( stderr, "> c++ exception occurred: %s\n", ::rtl::OUStringToOString( pExcTypeDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx index 7242ccd31ee6..b72ebc0ac1f3 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx @@ -213,7 +213,7 @@ static inline void cpp_call( nStackLongs ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx index 80bb54ea752b..6076f66093d1 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/cpp2uno.cxx @@ -163,7 +163,7 @@ static typelib_TypeClass cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case no exception occured... + // in case no exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -184,7 +184,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx index aa2bbde76708..916a42bb75e5 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx @@ -335,7 +335,7 @@ void cc50_solaris_sparc_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cp OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif bridges::cpp_uno::shared::ArrayPointer< unsigned int > thunkPtr( new unsigned int[6]); @@ -428,7 +428,7 @@ void cc50_solaris_sparc_fillUnoException( } #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "> c++ exception occured: %s\n", + fprintf( stderr, "> c++ exception occurred: %s\n", ::rtl::OUStringToOString( pExcTypeDescr->pTypeName, RTL_TEXTENCODING_ASCII_US ).getStr() ); diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx index 7b85bc1fee91..6a0c7d2eec7f 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx @@ -204,7 +204,7 @@ static void cpp_call( nStackLongs ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index f5eee3d497d1..5b9a7e7904e8 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -252,7 +252,7 @@ static typelib_TypeClass cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -273,7 +273,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx index 69372893fdf3..465cf47ae04f 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx @@ -315,7 +315,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, pStackStart, (pStack - pStackStart), pFPR, nFPR ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index 23ae2fdd46ee..f868b40b0f9e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -273,7 +273,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -292,7 +292,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx index dddda8ab8207..45b9860f8d05 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx @@ -342,7 +342,7 @@ static void cpp_call( pStackStart, (pStack - pStackStart), pGPR, nRegs, pFPR, nRegs ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index 33de6e86a6dd..89718405b4bf 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -187,7 +187,7 @@ namespace (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -208,7 +208,7 @@ namespace // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index 1fc67a2098d6..97130aedeb53 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -228,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -315,7 +315,7 @@ namespace CPPU_CURRENT_NAMESPACE OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 00a06643fda5..ea5438616464 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -470,7 +470,7 @@ static void cpp_call( (pStack - pStackStart), pGPR, nGPR); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 4c0767325224..52e5b7cf1a2b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -306,7 +306,7 @@ namespace fprintf(stderr, "after dispatch\n"); #endif - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -327,7 +327,7 @@ namespace // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index 36fe7968e19a..4147e3f2a4f8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -228,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -308,7 +308,7 @@ namespace CPPU_CURRENT_NAMESPACE OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx index 6d7a5333f1e1..deddfcfed517 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx @@ -323,7 +323,7 @@ static void cpp_call( pStackStart, (pStack - pStackStart), pGPR, pFPR); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index e22647945e56..486f58e7bb41 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -249,7 +249,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -269,7 +269,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx index 2be69d85ba90..393ed541ae3f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx @@ -505,7 +505,7 @@ static void cpp_call( pStackStart, ( pStack - pStackStart ), pGPR, nGPR, pFPR, nFPR ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index ac1cfb82c2be..ac9ac4233f23 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -164,7 +164,7 @@ void cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -183,7 +183,7 @@ void cpp2uno_call( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 69785be506f1..8013a8248bab 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -238,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -312,7 +312,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 20ee018e46be..035dab08d848 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -271,7 +271,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index a9ae0b7d9713..ad318a8f9e04 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -201,7 +201,7 @@ namespace fprintf(stderr, "after dispatch\n"); #endif - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -222,7 +222,7 @@ namespace // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 36fe7968e19a..4147e3f2a4f8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -228,7 +228,7 @@ namespace CPPU_CURRENT_NAMESPACE OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -308,7 +308,7 @@ namespace CPPU_CURRENT_NAMESPACE OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx index 97a9ab0187d9..b84215bfadcc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx @@ -302,7 +302,7 @@ static void cpp_call( pStackStart, (pStack - pStackStart)); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index d465fc1f45e7..f1597c37bac4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -313,7 +313,7 @@ namespace fprintf(stderr,"cpp2uno_call2,after dispatch\n"); #endif - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -333,7 +333,7 @@ namespace // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index 78d72c0c733b..edba6396ce00 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -225,7 +225,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -299,7 +299,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if defined BRIDGES_DEBUG OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx index 82d226f88ea6..4507206f2508 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx @@ -406,7 +406,7 @@ namespace pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx index c6ec833f282e..bc9702351464 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx @@ -295,7 +295,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -315,7 +315,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx index 0ebc44895a78..49a33f6d12ae 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx @@ -488,7 +488,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 5f4afc68d0a6..e4cf7307dde2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -268,7 +268,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -288,7 +288,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index af8f37c0aa71..6fb1c4eb0d39 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -415,7 +415,7 @@ static void cpp_call( pStackStart, ( pStack - pStackStart ), pGPR, nGPR, pFPR, nFPR ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx index 32e32de75b19..4112f48e9773 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx @@ -256,7 +256,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -275,7 +275,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx index a87cc8e182c8..11f9ba9c49d2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx @@ -444,7 +444,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx index 8205eb47447f..815d59611216 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx @@ -258,7 +258,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -277,7 +277,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx index d3fec618c301..8761da53d604 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx @@ -347,7 +347,7 @@ static void cpp_call( pStackStart, (pStack - pStackStart), pGPR, nGPR, pFPR, nFPR ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index 97ac1558e0bf..54833796f337 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -164,7 +164,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -183,7 +183,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 6e61196df98e..bfde350cd2c4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -228,7 +228,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -302,7 +302,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if defined BRIDGES_DEBUG OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index 0cf6d21c80e7..ffce7fa008d4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -413,7 +413,7 @@ static void cpp_call( pReturnTypeDescr->eTypeClass, (sal_Int32 *)pCppStackStart, nStackLongs); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 512b7d1f3f34..d61b843eabfc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -199,7 +199,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if ( pUnoExc ) { // destruct temporary in/inout params @@ -218,7 +218,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 759f28764fa7..4e15e6e36be3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -238,7 +238,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -312,7 +312,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 767961b9c691..8cd5356e3dd8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -376,7 +376,7 @@ static void cpp_call( pStackStart, ( pStack - pStackStart ), pGPR, nGPR, pFPR, nFPR ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx index f67b2f212ad7..2ceb0bba529d 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx @@ -167,7 +167,7 @@ void cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -186,7 +186,7 @@ void cpp2uno_call( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index c8cc3cd17257..f196ae734f71 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -303,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx index aaf696608e41..9f0000587923 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx @@ -282,7 +282,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr, bSimpleReturn, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx index a70a1e3b5f88..232144c5e80d 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx @@ -243,7 +243,7 @@ static typelib_TypeClass cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -264,7 +264,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx index 39388fc602f0..fdc30b3756b8 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx @@ -450,7 +450,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, pParamType, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx index 1cf37161fddb..ec9113d42f2f 100644 --- a/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_os2_intel/cpp2uno.cxx @@ -165,7 +165,7 @@ static typelib_TypeClass cpp2uno_call( fprintf( stderr, ">cpp2uno_call pUnoExc %x\n", pUnoExc); #endif - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -186,7 +186,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx index 99c2f62d1476..10ddb37ad8eb 100644 --- a/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_os2_intel/except.cxx @@ -249,7 +249,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -323,7 +323,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx index 64be1daa086e..74c81ccc4010 100644 --- a/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_os2_intel/uno2cpp.cxx @@ -270,7 +270,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx index 94dc4d5ca695..7b960f238508 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx @@ -163,7 +163,7 @@ static typelib_TypeClass cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -184,7 +184,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 5dfc476edafd..1516b2b02288 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -229,7 +229,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -303,7 +303,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx index 8035256d4db8..97dfe64ee32a 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx @@ -246,7 +246,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr->eTypeClass, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 786f4c20d02c..87ee5cc93ad6 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -163,7 +163,7 @@ static typelib_TypeClass cpp2uno_call( // invoke uno dispatch call (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -182,7 +182,7 @@ static typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 8d0be02e7d93..4811d2528d02 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -227,7 +227,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -301,7 +301,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if defined BRIDGES_DEBUG OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index b1c2767609f4..c7636bb5b191 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -408,7 +408,7 @@ static void cpp_call( pReturnTypeDescr->eTypeClass, (sal_Int32 *)pCppStackStart, nStackLongs); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx index 686d83b3386d..8bde24c63da0 100644 --- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx @@ -171,7 +171,7 @@ void cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -190,7 +190,7 @@ void cpp2uno_call( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any } - else // else no exception occured... + else // else no exception occurred... { // temporary params for ( ; nTempIndizes--; ) diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index 7a4aca8b1b4d..ccf4bb956af4 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -214,7 +214,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) OUStringToOString( *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ), RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() ); #endif void * pCppExc; type_info * rtti; @@ -288,7 +288,7 @@ void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping OUString unoName( toUNOname( header->exceptionType->name() ) ); #if OSL_DEBUG_LEVEL > 1 OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() ); + fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() ); #endif typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); if (0 == pExcTypeDescr) diff --git a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx index cbbe1312c464..4dd6cdefd083 100644 --- a/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx @@ -305,7 +305,7 @@ static void cpp_call( pAdjustedThisPtr, aVtableSlot.index, pCppReturn, pReturnTypeDescr, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... + // NO exception occurred... *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index b2687fddc543..f6ec4d13590a 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -166,7 +166,7 @@ static inline typelib_TypeClass cpp2uno_call( (*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - // in case an exception occured... + // in case an exception occurred... if (pUnoExc) { // destruct temporary in/inout params @@ -191,7 +191,7 @@ static inline typelib_TypeClass cpp2uno_call( // is here for dummy return typelib_TypeClass_VOID; } - else // else no exception occured... + else // else no exception occurred... { // temporary params while (nTempIndizes--) diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 4bda7cfa9074..5fff7444296e 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -620,7 +620,7 @@ int msci_filterCppException( RuntimeException exc( OUString( RTL_CONSTASCII_USTRINGPARAM( "[msci_uno bridge error] unexpected " - "C++ exception occured!") ), + "C++ exception occurred!") ), Reference< XInterface >() ); uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 0a131e94a05b..547ee4c6873f 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -291,7 +291,7 @@ static void cpp_call( return; } - // NO exception occured + // NO exception occurred *ppUnoExc = 0; // reconvert temporary params diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 2c89217c9721..9f60e6671c49 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -149,7 +149,7 @@ static void s_stub_computeObjectIdentifier(va_list * pParam) catch (::com::sun::star::uno::RuntimeException &) { OSL_ENSURE( - 0, "### RuntimeException occured udring queryInterface()!" ); + 0, "### RuntimeException occurred udring queryInterface()!" ); } } } diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index 7601648ad93a..d2130292b4b1 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -79,7 +79,7 @@ class JNI_context JNI_context( JNI_context & ); // not impl void operator = ( JNI_context ); // not impl - void java_exc_occured() const; + void java_exc_occurred() const; public: inline explicit JNI_context( JNI_info const * jni_info, JNIEnv * env, jobject class_loader ) @@ -117,7 +117,7 @@ inline void JNI_context::ensure_no_exception() const { if (JNI_FALSE != m_env->ExceptionCheck()) { - java_exc_occured(); + java_exc_occurred(); } } @@ -127,7 +127,7 @@ inline bool JNI_context::assert_no_exception() const if (JNI_FALSE != m_env->ExceptionCheck()) { m_env->ExceptionClear(); - OSL_ENSURE( 0, "unexpected java exception occured!" ); + OSL_ENSURE( 0, "unexpected java exception occurred!" ); return false; } return true; diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index 3f9f22a98c38..8843e83f71ce 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -292,7 +292,7 @@ Bridge::~Bridge() SAL_THROW( () ) //______________________________________________________________________________ -void JNI_context::java_exc_occured() const +void JNI_context::java_exc_occurred() const { // !don't rely on JNI_info! @@ -302,7 +302,7 @@ void JNI_context::java_exc_occured() const if (! jo_exc.is()) { throw BridgeRuntimeError( - OUSTR("java exception occured, but not available!?") + + OUSTR("java exception occurred, but not available!?") + get_stack_trace() ); } diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index fa32e879f1bd..8668cbcfa937 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -109,7 +109,7 @@ void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const { OUStringBuffer buf( 128 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("exception occured java->uno: [") ); + RTL_CONSTASCII_STRINGPARAM("exception occurred java->uno: [") ); buf.append( OUString::unacquired( &uno_exc->pType->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") ); buf.append( @@ -360,7 +360,7 @@ jobject Bridge::call_uno( #endif return 0; // void return } - else // exception occured + else // exception occurred { // destruct uno in args for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 70e139d66aab..11f0748c7799 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -78,7 +78,7 @@ void Bridge::handle_java_exc( if (! jo_exc.is()) { throw BridgeRuntimeError( - OUSTR("java exception occured, but no java exception available!?") + + OUSTR("java exception occurred, but no java exception available!?") + jni.get_stack_trace() ); } @@ -126,7 +126,7 @@ void Bridge::handle_java_exc( #if OSL_DEBUG_LEVEL > 1 OUStringBuffer trace_buf( 128 ); trace_buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("exception occured uno->java: [") ); + RTL_CONSTASCII_STRINGPARAM("exception occurred uno->java: [") ); trace_buf.append( exc_name ); trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") ); trace_buf.append( @@ -413,7 +413,7 @@ void Bridge::call_java( } } // else: already set integral uno return value - // no exception occured + // no exception occurred *uno_exc = 0; } #ifdef BROKEN_ALLOCA @@ -784,7 +784,7 @@ void SAL_CALL UNO_proxy_dispatch( reinterpret_cast< uno_Any * >( uno_ret ), 0, 0, 0 ); } - // no exception occured + // no exception occurred *uno_exc = 0; } } diff --git a/bridges/source/remote/static/proxy.cxx b/bridges/source/remote/static/proxy.cxx index db7b9a67a903..737dda701a28 100644 --- a/bridges/source/remote/static/proxy.cxx +++ b/bridges/source/remote/static/proxy.cxx @@ -251,7 +251,7 @@ void SAL_CALL dispatchRemote2UnoProxy( else { // ----------------------- - // an exception occured + // an exception occurred // ----------------------- typelib_TypeDescription *pAnyType = 0; getCppuType( (::com::sun::star::uno::Any*) 0 ).getDescription( &pAnyType ); diff --git a/bridges/source/remote/static/stub.cxx b/bridges/source/remote/static/stub.cxx index 58796351d5bd..0a1bb3450328 100644 --- a/bridges/source/remote/static/stub.cxx +++ b/bridges/source/remote/static/stub.cxx @@ -228,7 +228,7 @@ void SAL_CALL thisDispatch( else { // ----------------------- - // an exception occured + // an exception occurred // ----------------------- typelib_TypeDescription *pAnyType = 0; getCppuType( (Any*) 0 ).getDescription( &pAnyType ); diff --git a/bridges/source/remote/urp/urp_job.cxx b/bridges/source/remote/urp/urp_job.cxx index 8af686fa3ef3..25a97e0c42e2 100644 --- a/bridges/source/remote/urp/urp_job.cxx +++ b/bridges/source/remote/urp/urp_job.cxx @@ -154,7 +154,7 @@ namespace bridges_urp //------------------------------- // Handle the reply, unpack data //------------------------------- - if( m_bExceptionOccured ) + if( m_bExceptionOccurred ) { bReturn = m_pUnmarshal->unpackAny( *m_ppException ); } @@ -513,13 +513,13 @@ namespace bridges_urp sMessage.appendAscii( RTL_CONSTASCII_STRINGPARAM( "URP_Bridge : disposed\n" ) ); sMessage.append( m_pBridgeImpl->getErrorsAsString() ); prepareRuntimeExceptionClientSide( m_ppException, sMessage.makeStringAndClear() ); - m_bExceptionOccured = sal_True; + m_bExceptionOccurred = sal_True; } else { OSL_ASSERT( pDisposeReason == (void*)this ); } - if( !m_bExceptionOccured ) + if( !m_bExceptionOccurred ) { *m_ppException = 0; } diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx index 02ef755ecfae..b2bd6734b97b 100644 --- a/bridges/source/remote/urp/urp_job.hxx +++ b/bridges/source/remote/urp/urp_job.hxx @@ -127,7 +127,7 @@ public: public: typelib_InterfaceMethodTypeDescription *m_pMethodType; typelib_InterfaceAttributeTypeDescription *m_pAttributeType; - sal_Bool m_bExceptionOccured; + sal_Bool m_bExceptionOccurred; private: void **m_ppArgs; diff --git a/bridges/source/remote/urp/urp_reader.cxx b/bridges/source/remote/urp/urp_reader.cxx index 00941c468e1b..761168d7f516 100644 --- a/bridges/source/remote/urp/urp_reader.cxx +++ b/bridges/source/remote/urp/urp_reader.cxx @@ -776,7 +776,7 @@ void OReaderThread::run() break; } - pClientJob->m_bExceptionOccured = flags.bException; + pClientJob->m_bExceptionOccurred = flags.bException; pClientJob->setUnmarshal( &m_unmarshal ); #ifdef BRIDGES_URP_PROT |