diff options
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_ucb.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cefe65e2b8..deccfe5997 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -289,7 +289,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) if ( pResMgr ) aDiagnosticMessage.append( OUString(String(ResId(STR_INTERNAL_ERRMSG, *pResMgr ))) ); else - aDiagnosticMessage.appendAscii( "The following internal error has occured:\n\n" ); + aDiagnosticMessage.appendAscii( "The following internal error has occurred:\n\n" ); aDiagnosticMessage.append( aInternalErrMsg ); } diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 0efc0ae091..6444193a77 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -128,7 +128,7 @@ class ExtensionDescription public: /**throws an exception if the description.xml is not available, cannot be read, does not contain the expected data, - or any other error occured. Therefore it shoult only be used with + or any other error occurred. Therefore it shoult only be used with new extensions. Throws com::sun::star::uno::RuntimeException, diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index f0ac23d2fb..520b2a5699 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -419,7 +419,7 @@ oslProcess raiseProcess( case osl_Process_E_NotFound: throw RuntimeException( OUSTR("image not found!"), 0 ); case osl_Process_E_TimedOut: - throw RuntimeException( OUSTR("timout occured!"), 0 ); + throw RuntimeException( OUSTR("timout occurred!"), 0 ); case osl_Process_E_NoPermission: throw RuntimeException( OUSTR("permission denied!"), 0 ); case osl_Process_E_Unknown: diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 170a403ddc..cbfde03cc8 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -161,7 +161,7 @@ bool create_folder( } catch (CommandFailedException &) { // Interaction Handler already handled the error - // that has occured... + // that has occurred... } catch (Exception &) { if (throw_exc) diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 4ed6794854..9a0262c4ed 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -627,7 +627,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered( catch (Exception &) { Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( - OUSTR("unexpected exception occured!"), + OUSTR("unexpected exception occurred!"), static_cast<OWeakObject *>(this), exc ); } } diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index f6ad3f54bc..623389ba49 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -345,7 +345,7 @@ void JavaMigration::migrateJavarc() { OSL_ENSURE(0, "[Service implementation " IMPL_NAME "] XJob::execute: jfw_setSelectedJRE failed."); - fprintf(stderr, "\nCannot migrate Java. An error occured.\n"); + fprintf(stderr, "\nCannot migrate Java. An error occurred.\n"); } } else if (err == JFW_E_FAILED_VERSION) |