diff options
Diffstat (limited to 'desktop/source')
22 files changed, 37 insertions, 37 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b8fb3161e876..0e9a5be41bd7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -338,7 +338,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 ); } @@ -348,7 +348,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) //============================================================================= // shows a simple error box with the given message ... but exits from these process ! // -// Fatal errors cant be solved by the process ... nor any recovery can help. +// Fatal errors can't be solved by the process ... nor any recovery can help. // Mostly the installation was damaged and must be repaired manually .. or by calling // setup again. // @@ -1550,7 +1550,7 @@ sal_Bool Desktop::isCrashReporterEnabled() @param bCrashed [boolean ... out!] the office crashed last times. But may be there are no recovery data. - Usefull to trigger the error report tool without + Useful to trigger the error report tool without showing the recovery UI. @param bRecoveryDataExists [boolean ... out!] @@ -1755,7 +1755,7 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError) ( !pArgs->IsNoRestore() ) && // some use cases of office must work without recovery ( !pArgs->IsHeadless() ) && ( !pArgs->IsServer() ) && - (( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery cant work without UI ... but UI layer seams to be the reason for this crash + (( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery can't work without UI ... but UI layer seams to be the reason for this crash ( Application::IsInExecute() ) // crashes during startup and shutdown should be ignored (they indicates a corrupt installation ...) ); if ( bAllowRecoveryAndSessionManagement ) @@ -1917,7 +1917,7 @@ void Desktop::Main() RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ GetEnableATToolSupport" ); if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() ) { - sal_Bool bQuitApp; + sal_Bool bQuitApp (sal_False); if( !InitAccessBridge( true, bQuitApp ) ) if( bQuitApp ) @@ -1986,7 +1986,7 @@ void Desktop::Main() ( xSMgr->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.frame.GlobalEventBroadcaster" ) ), UNO_QUERY ); - /* ensure existance of a default window that messages can be dispatched to + /* ensure existence of a default window that messages can be dispatched to This is for the benefit of testtool which uses PostUserEvent extensively and else can deadlock while creating this window from another tread while the main thread is not yet in the event loop. @@ -2198,7 +2198,7 @@ void Desktop::Main() // Post user event to startup first application component window // We have to send this OpenClients message short before execute() to - // minimize the risk that this message overtakes type detection contruction!! + // minimize the risk that this message overtakes type detection construction!! Application::PostUserEvent( LINK( this, Desktop, OpenClients_Impl ) ); // Post event to enable acceptors @@ -3081,8 +3081,8 @@ void Desktop::OpenClients() sal_False , // false => force recovery instead of emergency save bCrashed , bExistsRecoveryData); - /* TODO we cant be shure, that at least one document could be recovered here successfully - So we set bLoaded=sal_True to supress opening of the default document. + /* TODO we can't be sure, that at least one document could be recovered here successfully + So we set bLoaded=sal_True to suppress opening of the default document. But we should make it more safe. Otherwhise we have an office without an UI ... ... May be we can check the desktop if some documents are existing there. @@ -3303,7 +3303,7 @@ String GetURL_Impl( } // Add path seperator to these directory and make given URL (rName) absolute by using of current working directory - // Attention: "setFianlSlash()" is neccessary for calling "smartRel2Abs()"!!! + // Attention: "setFianlSlash()" is necessary for calling "smartRel2Abs()"!!! // Otherwhise last part will be ignored and wrong result will be returned!!! // "smartRel2Abs()" interpret given URL as file not as path. So he truncate last element to get the base path ... // But if we add a seperator - he doesn't do it anymore. diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 70fd3b7c810c..d88bd41a7824 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -170,7 +170,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) #else // Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized - // GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from + // GNOME in order to avoid a deadlock that may occur in case UCP gets initialized from // a different thread. The latter may happen when calling the Office remotely via UNO. // THIS IS NOT A FIX, JUST A WORKAROUND! diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index b36eacd6fcf6..2705c25d305c 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -222,7 +222,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch ) { // Attention: URL must be parsed full. Otherwise some detections on it will fail! - // It doesnt matter, if parser isn't available. Because; We try loading of URL then ... + // It doesn't matter, if parser isn't available. Because; We try loading of URL then ... URL aURL ; aURL.Complete = aName; diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 41b54d36dfb3..72610332480e 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -36,7 +36,7 @@ namespace desktop { /* - Class for controlls dispatching of command URL through office command line. There + Class for controls dispatching of command URL through office command line. There are "dangerous" command URLs, that can result in a running office without UI. To prevent this situation the implementation surveile all dispatches and looks for an open task if there is arose a problem. If there is none the office will be shutdown to prevent a diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 8441a6558d00..36d2459d989d 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -216,7 +216,7 @@ bool LanguageSelection::prepareLanguage() try { // prepare default config provider by localizing it to the selected locale - // this will ensure localized configuration settings to be selected accoring to the + // this will ensure localized configuration settings to be selected according to the // UI language. Locale loc = LanguageSelection::IsoStringToLocale(aLocaleString); // flush any data already written to the configuration (which diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 6791ebebff07..2697f2afe5df 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -500,7 +500,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() // #119950# Try to connect pipe first. If connected, means another instance already launched. if( pThread->maPipe.create( pThread->maPipeIdent.getStr(), OPipe::TOption_Open, rSecurity )) { - // #119950# Test if launched in a new terminal session for same user. On Windows platform, normally a user is resticted + // #119950# Test if launched in a new terminal session for same user. On Windows platform, normally a user is restricted // to have only one terminal session. But if mutiple terminal session for one user is allowed, crash will happen if launched // OpenOffice from more than one terminal session. So need to detect and prevent this happen. @@ -516,7 +516,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() } } - else if ( pThread->maPipe.create( pThread->maPipeIdent.getStr(), OPipe::TOption_Create, rSecurity )) // Connection not successfull, now we try to create + else if ( pThread->maPipe.create( pThread->maPipeIdent.getStr(), OPipe::TOption_Create, rSecurity )) // Connection not successful, now we try to create { // Pipe created nPipeMode = PIPEMODE_CREATED; @@ -567,7 +567,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() return IPC_STATUS_BOOTSTRAP_ERROR; } } - // finaly, write the string onto the pipe + // finally, write the string onto the pipe pThread->maStreamPipe.write( aArguments.GetBuffer(), aArguments.Len() ); pThread->maStreamPipe.write( "\0", 1 ); diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 18b61dda9c21..b99da39e2fe8 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -110,7 +110,7 @@ public: If the platform element is present but does not specify a platform then an empty sequence is returned. Examples for invalid platform elements: <pre> - <platform />, <platform value="" />, <platfrom value=","> + <platform />, <platform value="" />, <platform value=","> </pre> The value attribute can contain various platform tokens. They must be separated by @@ -225,7 +225,7 @@ private: /** Retrieves a child element which as lang attribute which matches the office locale. Only top-level children are taken into account. It is also assumed that they are all - of the same element type and have a lang attribute. The matching algoritm is according + of the same element type and have a lang attribute. The matching algorithm is according to RFC 3066, with the exception that only one variant is allowed. @param parent the expression used to obtain the parent of the localized children. It can be null. diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index c5d7c1c4b224..bc57151fa5d2 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -588,9 +588,9 @@ ExtensionManager::getSupportedPackageTypes() return getUserRepository()->getSupportedPackageTypes(); } //Do some necessary checks and user interaction. This function does not -//aquire the extension manager mutex and that mutex must not be aquired +//acquire the extension manager mutex and that mutex must not be acquired //when this function is called. doChecksForAddExtension does synchronous -//user interactions which may require aquiring the solar mutex. +//user interactions which may require acquiring the solar mutex. //Returns true if the extension can be installed. bool ExtensionManager::doChecksForAddExtension( Reference<deploy::XPackageManager> const & xPackageMgr, @@ -1417,7 +1417,7 @@ sal_Bool ExtensionManager::synchronize( catch (...) { //We catch the exception, so we can write the lastmodified file - //so we will no repeat this everytime OOo starts. + //so we will no repeat this every time AOO starts. OSL_ENSURE(0, "Extensions Manager: synchronize"); } OUString lastSyncBundled(RTL_CONSTASCII_USTRINGPARAM( diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index f204418952d4..75010c1229fa 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 c3369a75da79..b31c4f35ae09 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -416,7 +416,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_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index ea07d4193a72..3b04bed99a16 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -171,7 +171,7 @@ namespace else if (token.equals(OUSTR(PLATFORM_MACOSX_X86))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64))) - ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64")); + ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("X86_64")); else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_OS2_X86))) diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 9476327d2982..2df7db3c6d72 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -174,7 +174,7 @@ void checkThirdSubtag(::rtl::OUString const & tag) //============================================================================= -//We parse the string acording to RFC 3066 +//We parse the string according to RFC 3066 //We only use the primary sub-tag and two subtags. That is lang-country-variant //We do some simple tests if the string is correct. Actually this should do a //validating parser diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 7435535be9c1..aa346918bb60 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -156,7 +156,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/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 960715276d10..fa83cb179057 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -128,7 +128,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference<XCommandEnvironment> const & xCmdEnv ); void configmgrini_flush( Reference<XCommandEnvironment> const & xCmdEnv ); - /* The paramter isURL is false in the case of adding the conf:ini-entry + /* The parameter isURL is false in the case of adding the conf:ini-entry value from the backend db. This entry already contains the path as it is used in the configmgr.ini. */ diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 09c66c9e9510..1a5dde024124 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -638,7 +638,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/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 5ec3c15fbbdf..eaf9b2864538 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -289,7 +289,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() if ( helpFolder.open() == ::osl::File::E_None) { //iterate over the contents of the help folder - //We assume that all folders withing the help folder contain language specific + //We assume that all folders within the help folder contain language specific //help files. If just one of them does not contain compiled help then this //function returns false. ::osl::DirectoryItem item; diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 8f03535c1c4f..92d6f1d4ddaf 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -113,7 +113,7 @@ protected: ::rtl::OUString const & sListTagName, ::rtl::OUString const & sMemberTagName); - /* returns the values of one particulary child element of all key elements. + /* returns the values of one particularly child element of all key elements. */ ::std::list< ::rtl::OUString> getOneChildFromAllEntries( ::rtl::OUString const & sElementName); diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 7179f138dc29..585363d4fd36 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -105,7 +105,7 @@ class BackendImpl : public ImplBaseT Reference<deployment::XPackage> bindBundleItem( OUString const & url, OUString const & mediaType, - sal_Bool bRemoved, //that is, useing data base information + sal_Bool bRemoved, //that is, using data base information OUString const & identifier, Reference<ucb::XCommandEnvironment> const & xCmdEnv, bool notifyDetectionError = true ); @@ -1569,7 +1569,7 @@ void BackendImpl::PackageImpl::scanLegacyBundle( { ::ucbhelper::Content ucbContent( url, xCmdEnv ); - // check for platform pathes: + // check for platform paths: const OUString title( ucbContent.getPropertyValue( StrTitle::get() ).get<OUString>() ); if (title.endsWithIgnoreAsciiCaseAsciiL( diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx index 4d95aed2c845..295f953203bc 100644 --- a/desktop/source/migration/cfgfilter.cxx +++ b/desktop/source/migration/cfgfilter.cxx @@ -147,7 +147,7 @@ void SAL_CALL CConfigFilter::readData( // in m_xLayerHandler. we will then submit ourself as a handler to // the SourceLayer in m_xSourceLayer. // when the source calls our handler functions we will use the patterns that - // where given in the ctor to decide whther they should be relaied to the caller + // where given in the ctor to decide whether they should be relaied to the caller if (m_xSourceLayer.is() && layerHandler.is()) { diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 0b3aea554fd1..8e049523613e 100755 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -221,7 +221,7 @@ void Migration::doMigration() aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); OSL_ENSURE(sal_False, aMsg.getStr()); } - OSL_ENSURE(bResult, "Migration has not been successfull"); + OSL_ENSURE(bResult, "Migration has not been successful"); // shut down migration framework releaseImpl(); } diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index f98e309ef052..0d7d99e4b100 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -340,7 +340,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) diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index d6cc4ecdab90..81595c047750 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -446,7 +446,7 @@ bool SplashScreen::loadBitmap( GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW ); - // Default case, we load the intro bitmap from a seperate file + // Default case, we load the intro bitmap from a separate file // (e.g. staroffice_intro.bmp or starsuite_intro.bmp) _aIntroBmp = aGraphic.GetBitmapEx(); return true; |