diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2010-12-05 19:11:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-06 09:16:29 +0000 |
| commit | 5dfd9daa2f96e79e7f82a90698db628e6991ce32 (patch) | |
| tree | 363b2dd83235a4087d2b4681ee234fbcd899397d | |
| parent | 7b277251a7b79fe3f83841ab9e3028670262e4dc (diff) | |
Replace all occured, occurance etc.feature/currency-64bit
167 files changed, 282 insertions, 282 deletions
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 3e0c48807..d5cc2b964 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -466,7 +466,7 @@ inline void SAL_CALL cppu_cppenv_computeObjectIdentifier( } catch (::com::sun::star::uno::RuntimeException &) { - OSL_ENSURE( 0, "### RuntimeException occured udring queryInterface()!" ); + OSL_ENSURE( 0, "### RuntimeException occurred udring queryInterface()!" ); } } } diff --git a/bridges/inc/bridges/remote/connection.h b/bridges/inc/bridges/remote/connection.h index 6e85250d8..6be1ac14e 100644 --- a/bridges/inc/bridges/remote/connection.h +++ b/bridges/inc/bridges/remote/connection.h @@ -43,7 +43,7 @@ struct remote_Connection all bytes are available or an error occurs. @return Number of bytes read. If the return value is less than nSize, an unrecoverable - i/o error has occured or the connection was closed. + i/o error has occurred or the connection was closed. */ sal_Int32 (SAL_CALL * read)(remote_Connection *, sal_Int8 *pDest, sal_Int32 nSize ); @@ -51,7 +51,7 @@ struct remote_Connection /** @return Number of bytes written. if the return value is less than nSize an unrecoverable - i/o error has occured or the connection was closed. + i/o error has occurred or the connection was closed. */ sal_Int32 (SAL_CALL * write)(remote_Connection *, const sal_Int8 *pSource, sal_Int32 nSize ); diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/cpp2uno.cxx index a8da4f0f1..426d22632 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 e0bb02db0..bf4083576 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 705cad8a3..a4c4baadf 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 ab245faea..30becfb6e 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 2c003cc4b..1e261d2cb 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 2d040352f..5bb52af1a 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 f5eee3d49..5b9a7e790 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 69372893f..465cf47ae 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 138fa8016..e8bd7e792 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 02801f756..154edade0 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 8e3251880..4097ef6d7 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 84f60331d..3b9a69edc 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 1a2c27136..59bcca6ea 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 1b6c4c4b6..346272967 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 a49edffc6..1edbac77f 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 377d8fd27..6d50e429b 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 adca82b5c..38ceffe6f 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 8e1d706a8..9c0e75b8a 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 f9f1fd179..0e804ed2b 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 807448909..044dfc5ef 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 30f6c1ce8..e1180c74f 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 cf00be341..792c1df7f 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 a49edffc6..1edbac77f 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 9ea27cfb0..527d9c95e 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 189e03759..e7cbe7d48 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 d99977e00..eddd17e3e 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 ba139cd43..e2813a9e0 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 5f132ecf2..e0b1850d3 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 0c0ad60c5..44424b150 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 230168b09..52e6b1424 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 0e88848d8..4efc5cb89 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 1a841236e..4768b09bd 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 6c8dc7d9d..231788f9f 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 9b3180e7c..b23c55963 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 1e7421dcd..dae619173 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 1d0be0d08..35c0ffa87 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 455617265..c71cedfa8 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 02f951a59..9d5c2d164 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 a208c2f10..3bb910e23 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 dd41ad1bd..3adf880cb 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 90acb02ff..685fea023 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 e5f9fd4fa..577d7b417 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 b6e170236..05bbcd071 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 8610c3cf5..e7ecaead4 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 8c8c31cb2..b14fde740 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 09a1935c4..846c6c5f8 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 1c4936374..be2afdec3 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 ec8447ba4..20411a7a2 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 d78ac1f62..9bb7eeb66 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 3afaa9bf2..9913b95ea 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 69d3881a7..68b2e6de0 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 d061e74fe..9d4624c65 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 0ec0fdda6..f450837f2 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 6833b9ed1..6576ee4e3 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 5d8448358..22a483aff 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 c7d08e0f9..1ede0e10a 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 7ad94a9ac..1e83c89d8 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 8cf382211..f88e6d2eb 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 34e0de99c..c8caf16ff 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 a7648d292..c4f1f063d 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 1667e216e..d46dc3bcf 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 32365c307..cc118a72a 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 ce8498826..92edbf678 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 cf5723957..192acca47 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 bd1bd2d73..fc7a69ce3 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 d4c59ab2a..6e98119f9 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 bf8428264..f7393a2f5 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 ee6d33184..87d7943dd 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 62d438632..23513cb4e 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 fe353e8c7..1a0d99675 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 1dfaf30d4..6b55b21ca 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 diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx index b79fb7c96..1dc4d05b2 100644 --- a/cli_ure/source/climaker/climaker_app.cxx +++ b/cli_ure/source/climaker/climaker_app.cxx @@ -723,7 +723,7 @@ SAL_IMPLEMENT_MAIN() osl_getThreadTextEncoding() ) ); fprintf( stderr, - "\n> error: .NET exception occured: %s\n> dying abnormally...", + "\n> error: .NET exception occurred: %s\n> dying abnormally...", msg.getStr() ); ret = 1; } diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index b8d488804..b4555a706 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -74,7 +74,7 @@ namespace * @param subKeyName name of the subkey to open * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ WCHAR* getPathFromRegistryKey( HKEY hroot, LPCWSTR subKeyName ) { diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 313aa39a4..c1604ecd0 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -1107,7 +1107,7 @@ void SAL_CALL cli_proxy_dispatch( { uno_any_construct( (uno_Any *)uno_ret, 0, 0, 0 ); } - // no excetpion occured + // no excetpion occurred *uno_exc = 0; } else diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index d417900af..20fd60818 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -188,7 +188,7 @@ System::Object* Bridge::call_uno(uno_Interface * pUnoI, } return 0; // void return } - else // exception occured + else // exception occurred { // destruct uno in args for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) @@ -281,7 +281,7 @@ void Bridge::call_cli( map_to_uno( uno_ret, retInvoke, return_type, false /* no assign */); } - // no exception occured + // no exception occurred *uno_exc = 0; } diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h index fe4a96f36..eed81174f 100644 --- a/cppu/inc/uno/cuno.h +++ b/cppu/inc/uno/cuno.h @@ -43,7 +43,7 @@ @param return_code return code of call */ -#define CUNO_EXCEPTION_OCCURED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION)) +#define CUNO_EXCEPTION_OCCURRED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION)) typedef sal_Int32 cuno_ErrorCode; diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 2a0f970e8..2fbe5153a 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -247,7 +247,7 @@ void LogProbe( rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr()); if ( ppException && *ppException ) { - rtl_logfile_trace( " excption occured : "); + rtl_logfile_trace( " excption occurred : "); typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index ecf6bcd56..554cee14b 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -493,7 +493,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, *ppException = 0; } - else // exception occured + else // exception occurred { for (sal_Int32 nPos = 0; nPos < nParams; ++ nPos) { diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 5a8de8a6c..6843617e5 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -106,7 +106,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p #if OSL_DEBUG_LEVEL > 1 OUStringBuffer buf( 128 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("### exception occured querying for interface ") ); + RTL_CONSTASCII_STRINGPARAM("### exception occurred querying for interface ") ); buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": [") ); buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) ); diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 1a73a1d4d..b811dadef 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -603,7 +603,7 @@ Reference< XComponentContext > SAL_CALL bootstrap() case osl_Process_E_NotFound: throw BootstrapException( OUSTR( "image not found!" ) ); case osl_Process_E_TimedOut: - throw BootstrapException( OUSTR( "timout occured!" ) ); + throw BootstrapException( OUSTR( "timout occurred!" ) ); case osl_Process_E_NoPermission: throw BootstrapException( OUSTR( "permission denied!" ) ); case osl_Process_E_Unknown: diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 306490aa1..b489c8e72 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -616,7 +616,7 @@ Any ComponentContext::lookupMap( OUString const & rName ) Any caught( getCaughtException() ); OUStringBuffer buf; buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( - "exception occured raising singleton \"") ); + "exception occurred raising singleton \"") ); buf.append( rName ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\": ") ); buf.append( exc.Message ); diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c index a52ecf265..202e8c998 100644 --- a/cppuhelper/source/findsofficepath.c +++ b/cppuhelper/source/findsofficepath.c @@ -45,7 +45,7 @@ * @param subKeyName name of the subkey to open * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) { @@ -87,7 +87,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) * Gets the installation path from the Windows Registry. * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* platformSpecific() { @@ -119,7 +119,7 @@ static char* platformSpecific() * is in one of the directories listed in the PATH environment variable.</p> * * @return the installation path or NULL, if no installation was found or - * if an error occured + * if an error occurred */ static char* platformSpecific() { diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx index 17b6eadb0..1a9b85a75 100644 --- a/cppuhelper/source/servicefactory.cxx +++ b/cppuhelper/source/servicefactory.cxx @@ -132,7 +132,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createSimpleRegistry( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() ); + OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() ); #else (void) exc; // avoid warning about unused variable #endif @@ -163,7 +163,7 @@ Reference< registry::XSimpleRegistry > SAL_CALL createNestedRegistry( #if OSL_DEBUG_LEVEL > 0 OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( !"### exception occured:", cstr_msg.getStr() ); + OSL_ENSURE( !"### exception occurred:", cstr_msg.getStr() ); #else (void) exc; // avoid warning about unused variable #endif diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index faa83b92f..b998580fd 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.cxx @@ -97,7 +97,7 @@ SAL_IMPLEMENT_MAIN() catch (Exception & exc) { OString cstr_msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( ! "exception occured: ", cstr_msg.getStr() ); + OSL_ENSURE( ! "exception occurred: ", cstr_msg.getStr() ); } printf( "Test finished\n" ); diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java index fd4800d69..27c57adc5 100644 --- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java +++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java @@ -167,7 +167,7 @@ public class ComponentContext implements XComponentContext, XComponent catch (com.sun.star.uno.Exception exc) { if (DEBUG) - System.err.println( "### exception occured on late init of singleton instance \"" + rName + "\": " + exc.getMessage() ); + System.err.println( "### exception occurred on late init of singleton instance \"" + rName + "\": " + exc.getMessage() ); } if (xInstance != null) diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java index 710141a17..c029fcf54 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java @@ -354,7 +354,7 @@ public class InterfaceContainer implements Cloneable } /** - * Searches for the first occurence of the given argument, testing + * Searches for the first occurrence of the given argument, testing * for equality using the <tt>equals</tt> method. * * @param elem an object. diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index 0f18ac781..d50e6d837 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -617,7 +617,7 @@ XMultiPropertySet * @return true - Conversion was successful. <em>newVal</em> contains a valid value for the property. false - * conversion failed for some reason. * @throws com.sun.star.lang.IllegalArgumentException The value provided is unfit for the property. - * @throws com.sun.star.lang.WrappedTargetException - An exception occured during the conversion, that is to be made known + * @throws com.sun.star.lang.WrappedTargetException - An exception occurred during the conversion, that is to be made known * to the caller. */ protected boolean convertPropertyValue(Property property, Object[] newVal, Object[]curVal, Object setVal) @@ -799,7 +799,7 @@ XMultiPropertySet * @param property the property for which the new value is set * @param value the new value for the property. * @throws com.sun.star.lang.WrappedTargetException An exception, which has to be made known to the caller, - * occured during the setting of the value. + * occurred during the setting of the value. */ protected void setPropertyValueNoBroadcast(Property property, Object newVal) throws WrappedTargetException diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java index 236b8bf31..012f98874 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java @@ -143,7 +143,7 @@ public class ComponentBase_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java index 55ad6d687..b1268f7ed 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java @@ -198,7 +198,7 @@ public class Factory_Test } catch (Exception exc) { - System.err.println( ">>>>>>>>>> exc occured: " + exc.toString() ); + System.err.println( ">>>>>>>>>> exc occurred: " + exc.toString() ); exc.printStackTrace(); } System.exit( 0 ); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java index 60f87d71e..cd83005cb 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java @@ -983,7 +983,7 @@ public class InterfaceContainer_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if ( ! bOk ) - System.out.println("Test finished.\nErrors occured!!!"); + System.out.println("Test finished.\nErrors occurred!!!"); else System.out.println("Test finished. \nNo errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java index c953e7bb9..dee5b29eb 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java @@ -361,7 +361,7 @@ public class MultiTypeInterfaceContainer_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if ( ! bOk ) - System.out.println("Test finished.\nErrors occured!!!"); + System.out.println("Test finished.\nErrors occurred!!!"); else System.out.println("Test finished. \nNo errors."); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java index da63cc1f1..7185bdc85 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java @@ -1079,7 +1079,7 @@ public class PropertySet_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); return bOk; diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java index d80644a4d..c51c5273b 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java @@ -199,7 +199,7 @@ public class WeakBase_Test for (int c= 0; c < i; c++) bOk= bOk && r[c]; if (bOk == false) - System.out.println("Errors occured!"); + System.out.println("Errors occurred!"); else System.out.println("No errors."); diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java index cb6088544..63029c0ec 100644 --- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java +++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java @@ -162,7 +162,7 @@ public class ServiceManager implements XMultiServiceFactory, * Registers a list of components given by their class names. * <p> * @param newImpls list of the components that should be registered, given by their class names. - * If any exception occured during the registration, the process will be canceled. + * If any exception occurred during the registration, the process will be canceled. * @see com.sun.star.container.XSet */ private void xaddFactories( String[] newImpls ) diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx index bdd4d9b46..b2ecf5173 100644 --- a/jvmfwk/source/fwkutil.hxx +++ b/jvmfwk/source/fwkutil.hxx @@ -121,7 +121,7 @@ enum FileStatus one of the values of FileStatus. @exception - Errors occured during determining if the file exists + Errors occurred during determining if the file exists */ FileStatus checkFileURL(const rtl::OUString & path); diff --git a/offapi/com/sun/star/form/binding/ListEntryEvent.idl b/offapi/com/sun/star/form/binding/ListEntryEvent.idl index 5112fda4d..532adc655 100644 --- a/offapi/com/sun/star/form/binding/ListEntryEvent.idl +++ b/offapi/com/sun/star/form/binding/ListEntryEvent.idl @@ -39,14 +39,14 @@ module com { module sun { module star { module form { module binding { //============================================================================= /** specifies the event which is notified when a change in a string entry - list occured + list occurred @see XListEntrySource @see XListEntryListener */ struct ListEntryEvent : com::sun::star::lang::EventObject { - /** denotes the position where a change occured. + /** denotes the position where a change occurred. <p>The concrete semantics of the value depends on the concrete event being notified.</p> diff --git a/offapi/com/sun/star/form/submission/XSubmission.idl b/offapi/com/sun/star/form/submission/XSubmission.idl index 28bebed6f..ad2f2de0e 100644 --- a/offapi/com/sun/star/form/submission/XSubmission.idl +++ b/offapi/com/sun/star/form/submission/XSubmission.idl @@ -63,7 +63,7 @@ interface XSubmission : com::sun::star::uno::XInterface requirements for the submission, e.g. data consistency, are fulfilled. @throws com::sun::star::lang::WrappedTargetException - if an error occured during invoking the submission target + if an error occurred during invoking the submission target */ void submit( ) raises ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException ); @@ -79,7 +79,7 @@ interface XSubmission : com::sun::star::uno::XInterface requirements for the submission, e.g. data consistency, are fulfilled. @throws com::sun::star::lang::WrappedTargetException - if an error occured during invoking the submission target + if an error occurred during invoking the submission target */ void submitWithInteraction( [in] com::sun::star::task::XInteractionHandler aHandler ) raises ( com::sun::star::util::VetoException, com::sun::star::lang::WrappedTargetException ); diff --git a/offapi/com/sun/star/frame/ControlEvent.idl b/offapi/com/sun/star/frame/ControlEvent.idl index 2a701bf6e..963a478ac 100644 --- a/offapi/com/sun/star/frame/ControlEvent.idl +++ b/offapi/com/sun/star/frame/ControlEvent.idl @@ -54,7 +54,7 @@ struct ControlEvent */ ::com::sun::star::util::URL aURL; - /** specifies the event which has occured. + /** specifies the event which has occurred. */ string Event; diff --git a/offapi/com/sun/star/frame/FrameActionEvent.idl b/offapi/com/sun/star/frame/FrameActionEvent.idl index 40f6d4002..76b37aab9 100644 --- a/offapi/com/sun/star/frame/FrameActionEvent.idl +++ b/offapi/com/sun/star/frame/FrameActionEvent.idl @@ -52,7 +52,7 @@ published struct FrameActionEvent: com::sun::star::lang::EventObject { //------------------------------------------------------------------------- - /** contains the frame in which the event occured + /** contains the frame in which the event occurred */ XFrame Frame; diff --git a/offapi/com/sun/star/frame/XLayoutManagerListener.idl b/offapi/com/sun/star/frame/XLayoutManagerListener.idl index dbdc68ed6..1e39c0e1b 100644 --- a/offapi/com/sun/star/frame/XLayoutManagerListener.idl +++ b/offapi/com/sun/star/frame/XLayoutManagerListener.idl @@ -58,7 +58,7 @@ interface XLayoutManagerListener : com::sun::star::lang::XEventListener reference to the layout manager which invoked the event. @param eLayoutEvent - identifies the layout event that has occured. + identifies the layout event that has occurred. @param aInfo provides additional information about the event. The type diff --git a/offapi/com/sun/star/frame/XStorable.idl b/offapi/com/sun/star/frame/XStorable.idl index be9a3b2fc..521774b03 100644 --- a/offapi/com/sun/star/frame/XStorable.idl +++ b/offapi/com/sun/star/frame/XStorable.idl @@ -99,7 +99,7 @@ published interface XStorable: com::sun::star::uno::XInterface <p>Only objects which know their locations can be stored.</p> @throws com::sun::star::io::IOException - if an IO error occured during save operation + if an IO error occurred during save operation (may the location is unknown) @see XStorable::storeAsURL @@ -129,7 +129,7 @@ published interface XStorable: com::sun::star::uno::XInterface (see <type scope="com::sun::star::document">MediaDescriptor</type> for further details) @throws com::sun::star::io::IOException - if an IO error occured during save operation + if an IO error occurred during save operation (may the location is unknown) @see XStorable::store @@ -152,7 +152,7 @@ published interface XStorable: com::sun::star::uno::XInterface persistence capability.</p> @throws com::sun::star::io::IOException - if an IO error occured during save operation + if an IO error occurred during save operation (may the location is unknown) @param lArguments diff --git a/offapi/com/sun/star/frame/XStorable2.idl b/offapi/com/sun/star/frame/XStorable2.idl index 05beeca35..07028fd85 100644 --- a/offapi/com/sun/star/frame/XStorable2.idl +++ b/offapi/com/sun/star/frame/XStorable2.idl @@ -73,7 +73,7 @@ published interface XStorable2: XStorable the optional parameters contain unacceptable for save entry @throws com::sun::star::io::IOException - if an IO error occured during save operation + if an IO error occurred during save operation @see XStorable::store */ diff --git a/offapi/com/sun/star/logging/XLogger.idl b/offapi/com/sun/star/logging/XLogger.idl index 45a2566d1..53ad5c296 100644 --- a/offapi/com/sun/star/logging/XLogger.idl +++ b/offapi/com/sun/star/logging/XLogger.idl @@ -121,17 +121,17 @@ interface XLogger void log( [in] long Level, [in] string Message ); /** logs a given message, detailing the source class and method at which the logged - event occured. + event occurred. @param Level the log level of this message. If this level is smaller than the logger's <member>Level</member> attribute, then the call will be ignored. @param SourceClass - the source class at which the logged event occured. + the source class at which the logged event occurred. @param SourceMethod - the source class at which the logged event occured. + the source class at which the logged event occurred. @param Message the message to log diff --git a/offapi/com/sun/star/mail/XMailServer.idl b/offapi/com/sun/star/mail/XMailServer.idl index 57af147a5..1a1d6e181 100644 --- a/offapi/com/sun/star/mail/XMailServer.idl +++ b/offapi/com/sun/star/mail/XMailServer.idl @@ -191,13 +191,13 @@ interface XMailServer: ::com::sun::star::uno::XInterface { a wrong server name, an unreachable DNS server, etc. @throws com::sun::star::io::NoRouteToHostException - if an error occured to connect to the remote mail server. + if an error occurred to connect to the remote mail server. Typically the remote mail server cannot be reach because of an intervening firewall, or if an intermediate router is down, the network connection is broken, etc. @throws com::sun::star::io::ConnectException - if an error occured while attempting to connect to the remote + if an error occurred while attempting to connect to the remote mail server. Typically the connection was refused remotely, because the mail server is not listening on the remote address/port. diff --git a/offapi/com/sun/star/mail/XMailService.idl b/offapi/com/sun/star/mail/XMailService.idl index 91076e071..c2b704871 100644 --- a/offapi/com/sun/star/mail/XMailService.idl +++ b/offapi/com/sun/star/mail/XMailService.idl @@ -169,13 +169,13 @@ interface XMailService: ::com::sun::star::uno::XInterface { a wrong server name, an unreachable DNS server, etc. @throws com::sun::star::io::NoRouteToHostException - if an error occured to connect to the remote mail server. + if an error occurred to connect to the remote mail server. Typically the remote mail server cannot be reach because of an intervening firewall, or if an intermediate router is down, the network connection is broken, etc. @throws com::sun::star::io::ConnectException - if an error occured while attempting to connect to the remote + if an error occurred while attempting to connect to the remote mail server. Typically the connection was refused remotely, because the mail server is not listening on the remote address/port. diff --git a/offapi/com/sun/star/plugin/PluginException.idl b/offapi/com/sun/star/plugin/PluginException.idl index 78f9a8923..fefe79cfd 100644 --- a/offapi/com/sun/star/plugin/PluginException.idl +++ b/offapi/com/sun/star/plugin/PluginException.idl @@ -38,7 +38,7 @@ //============================================================================= -/** Indicates that an error occured in an NPN or NPP function call. +/** Indicates that an error occurred in an NPN or NPP function call. @see XPlugin @see XPluginContext diff --git a/offapi/com/sun/star/scanner/ScanError.idl b/offapi/com/sun/star/scanner/ScanError.idl index cf40ccdc1..1abfa890d 100644 --- a/offapi/com/sun/star/scanner/ScanError.idl +++ b/offapi/com/sun/star/scanner/ScanError.idl @@ -39,7 +39,7 @@ published enum ScanError { //------------------------------------------------------------------------- // DOCUMENTATION CHANGED FOR ScanError:: ScanErrorNone, - /** ScanErrorNone: no error occured + /** ScanErrorNone: no error occurred */ ScanErrorNone, @@ -51,7 +51,7 @@ published enum ScanError //------------------------------------------------------------------------- // DOCUMENTATION CHANGED FOR ScanError:: ScanFailed, - /** ScanFailed: an error occured during scanning + /** ScanFailed: an error occurred during scanning */ ScanFailed, diff --git a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl index 845d71ea0..0fee9d375 100644 --- a/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl +++ b/offapi/com/sun/star/script/provider/ScriptErrorRaisedException.idl @@ -42,13 +42,13 @@ module com { module sun { module star { module script { module provider { by a LanguageScriptProvider whilst executing a script */ exception ScriptErrorRaisedException : com::sun::star::uno::Exception { - /** Name of script where error occured + /** Name of script where error occurred */ string scriptName; /** Scripting language of script that generated exception */ string language; - /** line number where error occured. + /** line number where error occurred. */ long lineNum; }; diff --git a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl index 71e94e2c3..3f099253f 100644 --- a/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl +++ b/offapi/com/sun/star/script/provider/ScriptExceptionRaisedException.idl @@ -42,7 +42,7 @@ module com { module sun { module star { module script { module provider { thrown by a LanguageScriptProvider whilst executing a script */ exception ScriptExceptionRaisedException : ::com::sun::star::script::provider::ScriptErrorRaisedException { - /** Name of script where error occured + /** Name of script where error occurred */ string exceptionType; }; diff --git a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl index 062145079..5519c3bf8 100644 --- a/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl +++ b/offapi/com/sun/star/script/provider/ScriptFrameworkErrorException.idl @@ -42,7 +42,7 @@ module com { module sun { module star { module script { module provider { by the Scripting Framework whilst executing a script */ exception ScriptFrameworkErrorException : com::sun::star::uno::Exception { - /** Name of script where error occured + /** Name of script where error occurred */ string scriptName; /** Scripting language of script that generated exception diff --git a/offapi/com/sun/star/sdb/SQLContext.idl b/offapi/com/sun/star/sdb/SQLContext.idl index e881627c3..e27a29f75 100644 --- a/offapi/com/sun/star/sdb/SQLContext.idl +++ b/offapi/com/sun/star/sdb/SQLContext.idl @@ -48,7 +48,7 @@ published exception SQLContext: com::sun::star::sdbc::SQLWarning { /** provides special info about the details where a <type scope="com::sun::star::sdbc">SQLException</type> - occured. + occurred. As usual for SQLExceptions, several SQLContext-objects may be chained, then the most recent context is appended to the list's tail */ diff --git a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl index b54ba0293..51d4cd825 100644 --- a/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl +++ b/offapi/com/sun/star/sdb/XSQLErrorBroadcaster.idl @@ -46,7 +46,7 @@ published interface XSQLErrorBroadcaster: com::sun::star::uno::XInterface { - /** adds the specified listener to receive the event "errorOccured" + /** adds the specified listener to receive the event "errorOccurred" @param com::sun::star::sdb::XSQLErrorListener */ [oneway] void addSQLErrorListener( diff --git a/offapi/com/sun/star/ucb/CommandFailedException.idl b/offapi/com/sun/star/ucb/CommandFailedException.idl index 6a04d0d04..0201b649d 100644 --- a/offapi/com/sun/star/ucb/CommandFailedException.idl +++ b/offapi/com/sun/star/ucb/CommandFailedException.idl @@ -38,7 +38,7 @@ module com { module sun { module star { module ucb { //============================================================================= -/** This exception is thrown if an exception situation occured during the +/** This exception is thrown if an exception situation occurred during the processing of a command and an <type scope="com::sun::star::task">XInteractionHandler</type> was able to handle the request for the error condition and the requesting code diff --git a/offapi/com/sun/star/ucb/FetchError.idl b/offapi/com/sun/star/ucb/FetchError.idl index c987d5839..7bc949d41 100644 --- a/offapi/com/sun/star/ucb/FetchError.idl +++ b/offapi/com/sun/star/ucb/FetchError.idl @@ -32,7 +32,7 @@ module com { module sun { module star { module ucb { //============================================================================= -/** These values are used to specify whether and which error has occured +/** These values are used to specify whether and which error has occurred while fetching data of some <type>ContentResultSet</type> rows. @see FetchResult diff --git a/offapi/com/sun/star/ucb/FetchResult.idl b/offapi/com/sun/star/ucb/FetchResult.idl index 965ffd876..1c6239e2a 100644 --- a/offapi/com/sun/star/ucb/FetchResult.idl +++ b/offapi/com/sun/star/ucb/FetchResult.idl @@ -71,7 +71,7 @@ published struct FetchResult boolean Orientation; //------------------------------------------------------------------------- - /** indicates whether and which error has occured, while fetching. + /** indicates whether and which error has occurred, while fetching. <p>The value may contain zero or more constants of the <type>FetchError</type> constants group. diff --git a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl index 9024ebc07..379082596 100644 --- a/offapi/com/sun/star/ucb/InteractiveFileIOException.idl +++ b/offapi/com/sun/star/ucb/InteractiveFileIOException.idl @@ -51,7 +51,7 @@ module com { module sun { module star { module ucb { published exception InteractiveFileIOException: com::sun::star::ucb::InteractiveIOException { //------------------------------------------------------------------------- - /** The file url where the i/o error occured + /** The file url where the i/o error occurred */ string FileName; }; diff --git a/offapi/com/sun/star/ucb/XCommandProcessor.idl b/offapi/com/sun/star/ucb/XCommandProcessor.idl index 60f50d194..d282b7a89 100644 --- a/offapi/com/sun/star/ucb/XCommandProcessor.idl +++ b/offapi/com/sun/star/ucb/XCommandProcessor.idl @@ -124,7 +124,7 @@ published interface XCommandProcessor : com::sun::star::uno::XInterface to indicate that two threads tried to use the same command identifier @throws Exception - if an error occured during the execution of the command. + if an error occurred during the execution of the command. */ any execute( [in] Command aCommand, [in] long CommandId, diff --git a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl index 046d1be48..2f95226ca 100644 --- a/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl +++ b/offapi/com/sun/star/ucb/XContentIdentifierMapping.idl @@ -111,7 +111,7 @@ published interface XContentIdentifierMapping: com::sun::star::uno::XInterface be returned unmodified). @returns <TRUE/> if any of the columns contain data that (potentially) - needs mapping (though maybe no mapping occured for the concrete input + needs mapping (though maybe no mapping occurred for the concrete input data of this call). This information can be useful to decide whether, for another row, a call to this function is at all necessary. */ diff --git a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl index edafc882b..a14ed6637 100644 --- a/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl +++ b/offapi/com/sun/star/ucb/XRemoteContentProviderChangeListener.idl @@ -53,7 +53,7 @@ published interface XRemoteContentProviderChangeListener: occur. @param Event - describes the change that has occured. + describes the change that has occurred. */ void remoteContentProviderChange([in] RemoteContentProviderChangeEvent Event); diff --git a/offapi/com/sun/star/util/XChangesNotifier.idl b/offapi/com/sun/star/util/XChangesNotifier.idl index 9d8c76d72..fd0ad2e55 100644 --- a/offapi/com/sun/star/util/XChangesNotifier.idl +++ b/offapi/com/sun/star/util/XChangesNotifier.idl @@ -46,7 +46,7 @@ module com { module sun { module star { module util { published interface XChangesNotifier: com::sun::star::uno::XInterface { //------------------------------------------------------------------------- - /** adds the specified listener to receive events when changes occured. + /** adds the specified listener to receive events when changes occurred. */ [oneway] void addChangesListener( [in] com::sun::star::util::XChangesListener aListener ); diff --git a/offapi/com/sun/star/util/XCloseListener.idl b/offapi/com/sun/star/util/XCloseListener.idl index 8bba2b35f..5e494d1e1 100644 --- a/offapi/com/sun/star/util/XCloseListener.idl +++ b/offapi/com/sun/star/util/XCloseListener.idl @@ -59,7 +59,7 @@ <p> If an event <method scope="com::sun::star::lang">XEventListener::disposing</method> - occured, nobody called <method>XCloseable::close</method> on listened object before. + occurred, nobody called <method>XCloseable::close</method> on listened object before. Then it's not allowed to break this request - it must be accepted! </p> @@ -122,7 +122,7 @@ published interface XCloseListener: com::sun::star::lang::XEventListener </p> <p> - If the event <member scope="com::sun::star::lang">XEventListener::disposing()</member> occured before + If the event <member scope="com::sun::star::lang">XEventListener::disposing()</member> occurred before it must be accepted too. There exist no chance for a disagreement any more. </p> diff --git a/offapi/com/sun/star/xforms/XModel.idl b/offapi/com/sun/star/xforms/XModel.idl index f1630ac09..c79e2ae2c 100644 --- a/offapi/com/sun/star/xforms/XModel.idl +++ b/offapi/com/sun/star/xforms/XModel.idl @@ -107,7 +107,7 @@ interface XModel consistency criteria for the model data is not fulfilled. @throws com::sun::star::lang::WrappedTargetException - when another error occured during the submission. The + when another error occurred during the submission. The <member scope="com::sun::star::lang">WrappedTargetException::TargetException</member> describes this error then. */ @@ -131,7 +131,7 @@ interface XModel consistency criteria for the model data is not fulfilled. @throws com::sun::star::lang::WrappedTargetException - when another error occured during the submission. The + when another error occurred during the submission. The <member scope="com::sun::star::lang">WrappedTargetException::TargetException</member> describes this error then. */ diff --git a/offapi/drafts/com/sun/star/form/ListEntryEvent.idl b/offapi/drafts/com/sun/star/form/ListEntryEvent.idl index e3f4aa36a..e07b8c28c 100644 --- a/offapi/drafts/com/sun/star/form/ListEntryEvent.idl +++ b/offapi/drafts/com/sun/star/form/ListEntryEvent.idl @@ -39,7 +39,7 @@ module drafts { module com { module sun { module star { module form { //============================================================================= /** specifies the event which is notified when a change in a string entry - list occured + list occurred @see XListEntrySource @see XListEntryListener @@ -49,7 +49,7 @@ module drafts { module com { module sun { module star { module form { */ struct ListEntryEvent : com::sun::star::lang::EventObject { - /** denotes the position where a change occured. + /** denotes the position where a change occurred. <p>The concrete semantics of the value depends on the concrete event being notified.</p> diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h index f89b2c09d..9002acc36 100644 --- a/registry/inc/registry/reader.h +++ b/registry/inc/registry/reader.h @@ -65,7 +65,7 @@ extern "C" { not be null; if the given binary blob is malformed, or of a version larger than <code>maxVersion</code>, null is returned - @return false iff an out-of-memory condition occured, in which case + @return false iff an out-of-memory condition occurred, in which case <code>result</code> is left unchanged, and no type reader is created @since UDK 3.2.0 @@ -323,7 +323,7 @@ void SAL_CALL typereg_reader_getFieldTypeName( @param result an out-parameter obtaining the field value's value; must not be null - @return false iff an out-of-memory condition occured, in which case + @return false iff an out-of-memory condition occurred, in which case <code>type</code> and <code>value</code> are left unchanged @since UDK 3.2.0 diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java index d13b01ab4..116923840 100644 --- a/ridljar/com/sun/star/lib/util/WeakMap.java +++ b/ridljar/com/sun/star/lib/util/WeakMap.java @@ -48,7 +48,7 @@ import java.util.Set; * * <p>Unlike other map implementations, <code>WeakMap</code> is asymmetric in * that <code>put</code> expects the given value to be a plain object that is - * then wrapped in a <code>WeakReference</code>, while the occurences of values + * then wrapped in a <code>WeakReference</code>, while the occurrences of values * in all other methods (<code>containsValue</code>, <code>entrySet</code>, * <code>equals</code>, <code>get</code>, <code>hashCode</code>, * <code>remove</code>, <code>values</code>, and also the return value of diff --git a/sal/inc/osl/conditn.h b/sal/inc/osl/conditn.h index 7c7117656..b0b08409b 100644 --- a/sal/inc/osl/conditn.h +++ b/sal/inc/osl/conditn.h @@ -40,7 +40,7 @@ typedef void* oslCondition; typedef enum { osl_cond_result_ok, /* successful completion */ - osl_cond_result_error, /* error occured, check osl_getLastSocketError() for details */ + osl_cond_result_error, /* error occurred, check osl_getLastSocketError() for details */ osl_cond_result_timeout, /* blocking operation timed out */ osl_cond_result_FORCE_EQUAL_SIZE = SAL_MAX_ENUM } oslConditionResult; diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx index 7301bceff..bfe9782c9 100644 --- a/sal/inc/osl/pipe_decl.hxx +++ b/sal/inc/osl/pipe_decl.hxx @@ -134,8 +134,8 @@ public: /** Delivers a constant decribing the last error for the pipe system. - @return ENONE if no error occured, invalid_PipeError if - an unknown (unmapped) error occured, otherwise an enum describing the + @return ENONE if no error occurred, invalid_PipeError if + an unknown (unmapped) error occurred, otherwise an enum describing the error. */ inline oslPipeError SAL_CALL getError() const; diff --git a/sal/inc/osl/process.h b/sal/inc/osl/process.h index 823d484f2..0bdb95858 100644 --- a/sal/inc/osl/process.h +++ b/sal/inc/osl/process.h @@ -69,7 +69,7 @@ typedef sal_uInt32 oslProcessExitCode; typedef enum { osl_Process_E_None, /* no error */ osl_Process_E_NotFound, /* image not found */ - osl_Process_E_TimedOut, /* timout occured */ + osl_Process_E_TimedOut, /* timout occurred */ osl_Process_E_NoPermission, /* permission denied */ osl_Process_E_Unknown, /* unknown error */ osl_Process_E_InvalidError, /* unmapped error */ @@ -323,7 +323,7 @@ oslProcessError SAL_CALL osl_joinProcess(oslProcess Process); @return osl_Process_E_None on success osl_Process_E_TimedOut waiting for the child process timed out - osl_Process_E_Unknown an error occured or the parameter are invalid + osl_Process_E_Unknown an error occurred or the parameter are invalid @see osl_executeProcess */ diff --git a/sal/inc/osl/socket.h b/sal/inc/osl/socket.h index 0f36d8603..8f20ecc75 100644 --- a/sal/inc/osl/socket.h +++ b/sal/inc/osl/socket.h @@ -195,7 +195,7 @@ typedef enum { */ typedef enum { osl_Socket_Ok, /* successful completion */ - osl_Socket_Error, /* error occured, check osl_getLastSocketError() for details */ + osl_Socket_Error, /* error occurred, check osl_getLastSocketError() for details */ osl_Socket_TimedOut, /* blocking operation timed out */ osl_Socket_Interrupted, /* blocking operation was interrupted */ osl_Socket_InProgress, /* nonblocking operation is in progress */ @@ -594,7 +594,7 @@ sal_Int32 SAL_CALL osl_sendToSocket(oslSocket Socket, how long the operation will block if the Socket is not ready. @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket - will NOT block; <code>sal_False</code> if it would block or if an error occured. + will NOT block; <code>sal_False</code> if it would block or if an error occurred. @param Socket the Socket to perfom the operation on. @param pTimeout if NULL, the operation will block without a timeout. @@ -605,7 +605,7 @@ sal_Bool SAL_CALL osl_isReceiveReady(oslSocket Socket, const TimeValue* pTimeout You can specify a timeout-value in seconds/microseconds that denotes how long the operation will block if the Socket is not ready. @return <code>sal_True</code> if send operations (send, sendTo) on the Socket - will NOT block; <code>sal_False</code> if it would block or if an error occured. + will NOT block; <code>sal_False</code> if it would block or if an error occurred. @param Socket the Socket to perfom the operation on. @param pTimeout if NULL, the operation will block without a timeout. Otherwise @@ -617,7 +617,7 @@ sal_Bool SAL_CALL osl_isSendReady(oslSocket Socket, const TimeValue* pTimeout); You can specify a timeout-value in seconds/microseconds that denotes how long the operation will block if the Socket has no pending OOB data. @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags) - on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occured. + on the Socket will NOT block; <code>sal_False</code> if it would block or if an error occurred. @param Socket the Socket to perfom the operation on. @param pTimeout if NULL, the operation will block without a timeout. @@ -717,7 +717,7 @@ sal_Bool SAL_CALL osl_shutdownSocket(oslSocket Socket, @param BufferSize contains the length of the Buffer. - @return -1 if an error occured or else the size of the data copied into + @return -1 if an error occurred or else the size of the data copied into pBuffer. @see osl_setSocketOption() */ @@ -778,7 +778,7 @@ sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket); <li> osl_Socket_TypeRaw <li> osl_Socket_TypeRdm <li> osl_Socket_TypeSeqPacket - <li> osl_invalid_SocketType, if an error occured + <li> osl_invalid_SocketType, if an error occurred </ul> */ @@ -790,9 +790,9 @@ oslSocketType SAL_CALL osl_getSocketType(oslSocket Socket); void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString **strError); /** returns a constant decribing the last error for the socket system. - @return <code>osl_Socket_E_NONE</code> if no error occured, + @return <code>osl_Socket_E_NONE</code> if no error occurred, <code>osl_invalid_SocketError</code> if an unknown (unmapped) - error occured, otherwise an enum describing the error. + error occurred, otherwise an enum describing the error. */ oslSocketError SAL_CALL osl_getLastSocketError(oslSocket Socket); diff --git a/sal/inc/osl/socket_decl.hxx b/sal/inc/osl/socket_decl.hxx index 051384c0a..6ec31ddd2 100644 --- a/sal/inc/osl/socket_decl.hxx +++ b/sal/inc/osl/socket_decl.hxx @@ -277,7 +277,7 @@ namespace osl You can specify a timeout-value in seconds/nanoseconds that denotes how the operation will block if the Socket is not ready. @return <code>sal_True</code> if read operations (recv, recvFrom, accept) on the Socket - will NOT block; <code>sal_False</code> if it would block or if an error occured. + will NOT block; <code>sal_False</code> if it would block or if an error occurred. @param pTimeout if 0, the operation will block without a timeout. Otherwise the specified amout of time. @@ -289,7 +289,7 @@ namespace osl You can specify a timeout-value in seconds/nanoseconds that denotes how the operation will block if the Socket is not ready. @return <code>sal_True</code> if send operations (send, sendTo) on the Socket - will NOT block; <code>sal_False</code> if it would block or if an error occured. + will NOT block; <code>sal_False</code> if it would block or if an error occurred. @param pTimeout if 0, the operation will block without a timeout. Otherwise the specified amout of time. @@ -304,7 +304,7 @@ namespace osl @return <code>sal_True</code> if OOB-request operations (recv with appropriate flags) on the Socket will NOT block; <code>sal_False</code> if it would block or if - an error occured. + an error occurred. @param pTimeout if 0, the operation will block without a timeout. Otherwise the specified amout of time. @@ -320,7 +320,7 @@ namespace osl <li> <code>osl_Socket_TypeRaw</code> <li> <code>osl_Socket_TypeRdm</code> <li> <code>osl_Socket_TypeSeqPacket</code> - <li> <code>osl_invalid_SocketType</code>, if an error occured + <li> <code>osl_invalid_SocketType</code>, if an error occurred </ul> */ inline oslSocketType SAL_CALL getType() const; @@ -404,7 +404,7 @@ namespace osl <li><code>osl_Socket_LevelTcp</code> : Level of Transmission Control Protocol </ul> @return The size of the attribute copied into pBuffer or -1 if an error - occured. + occurred. */ inline sal_Int32 SAL_CALL getOption( oslSocketOption Option, @@ -488,8 +488,8 @@ namespace osl /** returns a constant decribing the last error for the socket system. - @return osl_Socket_E_NONE if no error occured, invalid_SocketError if - an unknown (unmapped) error occured, otherwise an enum describing the + @return osl_Socket_E_NONE if no error occurred, invalid_SocketError if + an unknown (unmapped) error occurred, otherwise an enum describing the error. @see osl_getLastSocketError() */ diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h index f01b03c5a..4261e0bf0 100644 --- a/sal/inc/rtl/bootstrap.h +++ b/sal/inc/rtl/bootstrap.h @@ -218,7 +218,7 @@ void SAL_CALL rtl_bootstrap_expandMacros( an arbitrary, non-NULL value @param encoded - non-NULL out parameter, receiving the given value with all occurences of + non-NULL out parameter, receiving the given value with all occurrences of special characters ("$" and "\") escaped @since UDK 3.2.9 diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx index 9cd1b382e..9f22a848b 100644 --- a/sal/inc/rtl/bootstrap.hxx +++ b/sal/inc/rtl/bootstrap.hxx @@ -150,7 +150,7 @@ namespace rtl an arbitrary value @return - the given value, with all occurences of special characters ("$" and + the given value, with all occurrences of special characters ("$" and "\") escaped @since UDK 3.2.9 diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx index a19ef501d..15277da90 100644 --- a/sal/inc/rtl/instance.hxx +++ b/sal/inc/rtl/instance.hxx @@ -232,10 +232,10 @@ namespace { Some comments: For any instantiation of rtl_Instance, at most one call to a create method - may occur in the program code: Each occurance of a create method within + may occur in the program code: Each occurrence of a create method within the program code is supposed to return a fresh object instance on the first call, and that same object instance on subsequent calls; but - independent occurances of create methods are supposed to return + independent occurrences of create methods are supposed to return independent object instances. Since there is a one-to-one correspondence between object instances and instantiations of rtl_Instance, the requirement should be clear. One measure to enforce the requirement is @@ -245,7 +245,7 @@ namespace { needs a funny "hand coded" prefix "rtl_" instead of a proper namespace prefix like "::rtl::". - A known problem with this template is when two occurences of calls to + A known problem with this template is when two occurrences of calls to create methods with identical template arguments appear in one translation unit. Those two places will share a single object instance. This can be avoided by using different Init structs (see the above code samples) in diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h index 5543fcf7f..072708e84 100644 --- a/sal/inc/rtl/tencinfo.h +++ b/sal/inc/rtl/tencinfo.h @@ -104,7 +104,7 @@ typedef struct _rtl_TextEncodingInfo ASCII control codes 0x00--1F are not included here, as they are used for special purposes in some encodings. - If an encoding has this property, it is easy to search for occurences of + If an encoding has this property, it is easy to search for occurrences of ASCII characters within strings of this encoding---you do not need to keep track whether a byte in the range 0x20--7F really represents an ASCII character or rather is part of some multi-byte character. diff --git a/sal/osl/os2/except.c b/sal/osl/os2/except.c index ed8eedca4..5683aa21c 100644 --- a/sal/osl/os2/except.c +++ b/sal/osl/os2/except.c @@ -79,7 +79,7 @@ + } + CATCH(excptid) + { - + .... // exception occured: react here + + .... // exception occurred: react here + } END_CATCH(); // always needed! + } // end of your_func * @@ -166,7 +166,7 @@ + CATCH(excpt1) { } END_CATCH(); // always needed! + + if (fSemOwned) - + // this gets executed always, even if an exception occured + + // this gets executed always, even if an exception occurred + DosReleaseMutexSem(hmtx); + } // end of your_func * @@ -736,7 +736,7 @@ VOID excExplainException(FILE *file, // in: logfile from fopen // *** instruction - fprintf(file, "Instruction pointer (where exception occured):\n CS:EIP = %04lX:%08lX ", + fprintf(file, "Instruction pointer (where exception occurred):\n CS:EIP = %04lX:%08lX ", pContextRec->ctx_SegCs, pContextRec->ctx_RegEip); excDescribePage(file, pContextRec->ctx_RegEip); diff --git a/sal/osl/os2/file_path_helper.h b/sal/osl/os2/file_path_helper.h index 6e179d547..94faf0556 100644 --- a/sal/osl/os2/file_path_helper.h +++ b/sal/osl/os2/file_path_helper.h @@ -160,7 +160,7 @@ /***************************************** osl_systemPathGetParent - Replaces the last occurrance of a path + Replaces the last occurrence of a path separator with '\0' and returns the position where the '/' was replaced diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx index adb86e3d4..eb4ff975b 100644 --- a/sal/osl/os2/file_path_helper.hxx +++ b/sal/osl/os2/file_path_helper.hxx @@ -165,7 +165,7 @@ namespace osl /***************************************** systemPathGetParent - Replaces the last occurrance of a path + Replaces the last occurrence of a path separator with '\0' and returns the position where the '/' was replaced diff --git a/sal/osl/os2/helpers/except.h b/sal/osl/os2/helpers/except.h index a067e188f..0bc742cee 100644 --- a/sal/osl/os2/helpers/except.h +++ b/sal/osl/os2/helpers/except.h @@ -226,7 +226,7 @@ extern "C" { (PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); \ } /* end of TRY block */ \ else \ - { /* exception occured: */ \ + { /* exception occurred: */ \ DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2)); #endif @@ -235,7 +235,7 @@ extern "C" { #define END_CATCH() } #else #define END_CATCH() \ - } /* end of exception-occured block */ \ + } /* end of exception-occurred block */ \ } #endif diff --git a/sal/osl/os2/pipe.cxx b/sal/osl/os2/pipe.cxx index 982648876..b960d861c 100644 --- a/sal/osl/os2/pipe.cxx +++ b/sal/osl/os2/pipe.cxx @@ -473,7 +473,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe) sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_Int32 BytesSend= 0; sal_Int32 BytesToSend= n; @@ -484,7 +484,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -500,7 +500,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ sal_Int32 BytesRead= 0; sal_Int32 BytesToRead= n; @@ -510,7 +510,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) sal_Int32 RetVal; RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c index cb8536871..b97dde7e3 100644 --- a/sal/osl/os2/socket.c +++ b/sal/osl/os2/socket.c @@ -2249,7 +2249,7 @@ sal_Int32 SAL_CALL osl_readSocket ( OSL_ASSERT( pSocket); - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ while (BytesToRead > 0) { sal_Int32 RetVal; @@ -2258,7 +2258,7 @@ sal_Int32 SAL_CALL osl_readSocket ( BytesToRead, osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -2278,7 +2278,7 @@ sal_Int32 SAL_CALL osl_readSocket ( sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_Int32 n ) { - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_uInt32 BytesSend= 0; sal_uInt32 BytesToSend= n; sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer; @@ -2291,7 +2291,7 @@ sal_Int32 SAL_CALL osl_writeSocket( RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 3c886411f..391f90fa9 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -373,7 +373,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( rtl_uString *ustrSystemPath, /* adapt index to pTmp */ nIndex += pTmp->length - ustrSystemPath->length; - /* remove all occurances of '//' */ + /* remove all occurrences of '//' */ for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ ) { if( ((sal_Unicode) '/' == pTmp->buffer[nSrcIndex]) && ((sal_Unicode) '/' == pTmp->buffer[nIndex]) ) diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c index 8a0248f6c..4e7c07eee 100644 --- a/sal/osl/unx/pipe.c +++ b/sal/osl/unx/pipe.c @@ -535,7 +535,7 @@ oslPipeError SAL_CALL osl_getLastPipeError(oslPipe pPipe) sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_Int32 BytesSend= 0; sal_Int32 BytesToSend= n; @@ -546,7 +546,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -562,7 +562,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ sal_Int32 BytesRead= 0; sal_Int32 BytesToRead= n; @@ -572,7 +572,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) sal_Int32 RetVal; RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index add11b59e..71eefcaee 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -136,7 +136,7 @@ plan to have the new handler use this signal*/ { SIGWINCH, ACT_IGNORE, NULL }, /* window size change */ { SIGURG, ACT_EXIT, NULL }, /* urgent socket condition */ #ifdef SIGPOLL - { SIGPOLL, ACT_EXIT, NULL }, /* pollable event occured */ + { SIGPOLL, ACT_EXIT, NULL }, /* pollable event occurred */ #endif { SIGSTOP, ACT_SYSTEM, NULL }, /* stop (cannot be caught or ignored) */ { SIGTSTP, ACT_SYSTEM, NULL }, /* user stop requested from tty */ diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index 90fe9eb55..eede0a145 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -2283,7 +2283,7 @@ sal_Int32 SAL_CALL osl_readSocket ( OSL_ASSERT( pSocket); - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ while (BytesToRead > 0) { sal_Int32 RetVal; @@ -2292,7 +2292,7 @@ sal_Int32 SAL_CALL osl_readSocket ( BytesToRead, osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -2312,7 +2312,7 @@ sal_Int32 SAL_CALL osl_readSocket ( sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_Int32 n ) { - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_uInt32 BytesSend= 0; sal_uInt32 BytesToSend= n; sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer; @@ -2325,7 +2325,7 @@ sal_Int32 SAL_CALL osl_writeSocket( RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/osl/w32/pipe.c b/sal/osl/w32/pipe.c index 0ed681fce..f284a02d4 100644 --- a/sal/osl/w32/pipe.c +++ b/sal/osl/w32/pipe.c @@ -566,7 +566,7 @@ sal_Int32 SAL_CALL osl_sendPipe(oslPipe pPipe, sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_Int32 BytesSend= 0; sal_Int32 BytesToSend= n; @@ -577,7 +577,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 RetVal= osl_sendPipe(pPipe, pBuffer, BytesToSend); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -593,7 +593,7 @@ sal_Int32 SAL_CALL osl_writePipe( oslPipe pPipe, const void *pBuffer , sal_Int32 sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) { - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ sal_Int32 BytesRead= 0; sal_Int32 BytesToRead= n; @@ -603,7 +603,7 @@ sal_Int32 SAL_CALL osl_readPipe( oslPipe pPipe, void *pBuffer , sal_Int32 n ) sal_Int32 RetVal; RetVal= osl_receivePipe(pPipe, pBuffer, BytesToRead); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 242a3edad..443ec0634 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -592,7 +592,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( } } - /* if an error occured we have to close the server side pipe ends too */ + /* if an error occurred we have to close the server side pipe ends too */ if (hInputWrite) CloseHandle(hInputWrite); diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 86fa5c0ae..e758fdc5b 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -1547,7 +1547,7 @@ sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n OSL_ASSERT( pSocket); - /* loop until all desired bytes were read or an error occured */ + /* loop until all desired bytes were read or an error occurred */ sal_uInt32 BytesRead= 0; sal_uInt32 BytesToRead= n; while (BytesToRead > 0) @@ -1558,7 +1558,7 @@ sal_Int32 SAL_CALL osl_readSocket( oslSocket pSocket, void *pBuffer, sal_Int32 n BytesToRead, osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; @@ -1579,7 +1579,7 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_ { OSL_ASSERT( pSocket ); - /* loop until all desired bytes were send or an error occured */ + /* loop until all desired bytes were send or an error occurred */ sal_uInt32 BytesSend= 0; sal_uInt32 BytesToSend= n; sal_uInt8 *Ptr = ( sal_uInt8 * )pBuffer; @@ -1589,7 +1589,7 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket pSocket, const void *pBuffer, sal_ RetVal= osl_sendSocket( pSocket,Ptr,BytesToSend,osl_Socket_MsgNormal); - /* error occured? */ + /* error occurred? */ if(RetVal <= 0) { break; diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl index 1346b5514..508ab2129 100644 --- a/sal/qa/buildall.pl +++ b/sal/qa/buildall.pl @@ -272,7 +272,7 @@ sub giveOutFailures($$) if ($nFailures > 0) { # extra return for a better output - print "\nFailures occured: $nFailures\n"; + print "\nFailures occurred: $nFailures\n"; print "The whole output can be found in $sFailureFile\n"; print "\n"; @@ -488,7 +488,7 @@ $/) if ($nGlobalFailures > 0) { - print "\nFailures over all occured: $nGlobalFailures\n"; + print "\nFailures over all occurred: $nGlobalFailures\n"; print "\nPASSED FAILED.\n"; } else diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index a9abd0f09..eb5ec5ea8 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -578,7 +578,7 @@ namespace osl_Thread myThread* newthread = new myThread(); sal_Bool res1 = newthread->create(); sal_Bool res2 = newthread->create(); - t_print("In non pro, an assertion should occured. This behaviour is right.\n"); + t_print("In non pro, an assertion should occurred. This behaviour is right.\n"); termAndJoinThread(newthread); delete newthread; diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 23a511460..9f6f693d4 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -1505,7 +1505,7 @@ namespace osl_Socket /// Socket constructor. // ::osl::Socket sSocket; - CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured", + CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred", 1 == 1 ); } diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index bb97fdc10..1207dfc2d 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -176,7 +176,7 @@ namespace osl_Socket /// Socket constructor. // ::osl::Socket sSocket(); - CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured", + CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred", 1 == 1 ); } diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index 8404a6afa..cc96158d1 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -335,7 +335,7 @@ void IdlAttributeFieldImpl::checkException( throw WrappedTargetRuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( - "non-RuntimeException occured when accessing an" + "non-RuntimeException occurred when accessing an" " interface type attribute")), context, e); } @@ -749,7 +749,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & InvocationTargetException aExc; aExc.Context = *(const Reference< XInterface > *)rObj.getValue(); - aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured during invocation!") ); + aExc.Message = OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred during invocation!") ); uno_any_destruct( &aExc.TargetException, reinterpret_cast< uno_ReleaseFunc >(cpp_release) ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 6218d2a2d..b3f5ab62e 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -639,7 +639,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value ) catch (Exception & exc) { throw InvocationTargetException( - OUString( RTL_CONSTASCII_USTRINGPARAM("exception occured in setValue(): ") ) + + OUString( RTL_CONSTASCII_USTRINGPARAM("exception occurred in setValue(): ") ) + exc.Message, Reference< XInterface >(), makeAny( exc /* though sliced */ ) ); } } diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 1bf1a6699..1cecbd395 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -304,7 +304,7 @@ bool AdapterImpl::coerce_assign( m_pFactory->m_pConverter, m_pFactory->m_pConvertToTD, &ret, args, &p_exc ); - if (p_exc) // exception occured + if (p_exc) // exception occurred { OSL_ASSERT( p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION ); diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 09e9360e5..05f400e18 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -160,7 +160,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface( } else { - // exception occured: + // exception occurred: OSL_ENSURE( typelib_typedescriptionreference_isAssignableFrom( ::getCppuType( reinterpret_cast< diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index a63510dee..914b174e1 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -852,7 +852,7 @@ PermissionCollection AccessController::getEffectivePermissions( clearPostPoned(); // safety: exception could have happened before checking postponed? OUStringBuffer buf( 64 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occured): ") ); + RTL_CONSTASCII_STRINGPARAM("deployment error (AccessControlException occurred): ") ); buf.append( exc.Message ); throw DeploymentException( buf.makeStringAndClear(), exc.Context ); } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index a440c46c2..6e2e7a03a 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -929,7 +929,7 @@ void OServiceManager::onUnloadingNotify() IT_MM it_end1= m_ServiceMap.end(); list<IT_MM> listDeleteServiceMap; typedef list<IT_MM>::const_iterator CIT_DMM; - // find occurences in m_ServiceMap + // find occurrences in m_ServiceMap for(IT_MM it_i1= m_ServiceMap.begin(); it_i1 != it_end1; it_i1++) { if( m_SetLoadedFactories.find( it_i1->second) != it_SetEnd) @@ -1042,7 +1042,7 @@ void OServiceManager::disposing() { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### RuntimeException occured upon disposing factory: %s", str.getStr() ); + OSL_TRACE( "### RuntimeException occurred upon disposing factory: %s", str.getStr() ); #else (void) exc; // unused #endif @@ -1264,7 +1264,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### DisposedException occured: %s", str.getStr() ); + OSL_TRACE( "### DisposedException occurred: %s", str.getStr() ); #else (void) exc; // unused #endif @@ -1328,7 +1328,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( { #if OSL_DEBUG_LEVEL > 1 OString str( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### DisposedException occured: %s", str.getStr() ); + OSL_TRACE( "### DisposedException occurred: %s", str.getStr() ); #else (void) exc; // unused #endif diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx index f37a36edd..80d5f1219 100644 --- a/stoc/source/tdmanager/tdmgr.cxx +++ b/stoc/source/tdmanager/tdmgr.cxx @@ -476,7 +476,7 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (container::NoSuchElementException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchElementException occured: ") + + OUSTR("NoSuchElementException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } @@ -512,13 +512,13 @@ void SAL_CALL ManagerImpl::insert( const Any & rElement ) catch (reflection::NoSuchTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("NoSuchTypeNameException occured: ") + exc.Message, + OUSTR("NoSuchTypeNameException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } catch (reflection::InvalidTypeNameException & exc) { throw lang::IllegalArgumentException( - OUSTR("InvalidTypeNameException occured: ") + exc.Message, + OUSTR("InvalidTypeNameException occurred: ") + exc.Message, static_cast<OWeakObject *>(this), -1 /* unknown */ ); } } diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 6bab261c0..26bc4f7a1 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -183,9 +183,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index eb058a73e..1bcfb5f76 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -694,9 +694,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index c9d06cdc2..3fcd5c1ff 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -400,10 +400,10 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 133fd138a..a9ccc3ee2 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -1059,7 +1059,7 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - fprintf( stderr, "> exception occured: " ); + fprintf( stderr, "> exception occurred: " ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); fprintf( stderr, "%s\n", aMsg.getStr() ); } diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index abe3ac44f..76b6cd67e 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -1582,9 +1582,9 @@ SAL_IMPLEMENT_MAIN() } catch (Exception & rExc) { - OSL_ENSURE( sal_False, "### exception occured!" ); + OSL_ENSURE( sal_False, "### exception occurred!" ); OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) ); - OSL_TRACE( "### exception occured: " ); + OSL_TRACE( "### exception occurred: " ); OSL_TRACE( aMsg.getStr() ); OSL_TRACE( "\n" ); } diff --git a/udkapi/com/sun/star/beans/XMultiPropertySet.idl b/udkapi/com/sun/star/beans/XMultiPropertySet.idl index abcf6cac1..222f4d44b 100644 --- a/udkapi/com/sun/star/beans/XMultiPropertySet.idl +++ b/udkapi/com/sun/star/beans/XMultiPropertySet.idl @@ -81,7 +81,7 @@ published interface XMultiPropertySet: com::sun::star::uno::XInterface <p>The values of the properties must change before the bound events are fired. The values of the constrained properties should change after the vetoable events are fired and only if no - exception occured. Unknown properties are ignored. </p> + exception occurred. Unknown properties are ignored. </p> @param aPropertyNames specifies the names of the properties. All names must be unique. diff --git a/udkapi/com/sun/star/test/XSimpleTest.idl b/udkapi/com/sun/star/test/XSimpleTest.idl index 2097380ad..4be670675 100644 --- a/udkapi/com/sun/star/test/XSimpleTest.idl +++ b/udkapi/com/sun/star/test/XSimpleTest.idl @@ -95,7 +95,7 @@ published interface XSimpleTest: com::sun::star::uno::XInterface //------------------------------------------------------------------------- /**States if one of the last test has failed. This is cumulative. - @return true if all test have been passed succesfully. false if an error has occured. + @return true if all test have been passed succesfully. false if an error has occurred. */ boolean testPassed(); |