diff options
Diffstat (limited to 'cppuhelper/source')
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/component_context.cxx | 2 | ||||
| -rw-r--r-- | cppuhelper/source/findsofficepath.c | 6 | ||||
| -rw-r--r-- | cppuhelper/source/servicefactory.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 245714827145..98ac45b3eb03 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 de1d106912bd..364f66d69387 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 475ce747d7ad..0d97de89304b 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 919fe7bbb995..22058bb14082 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 |