diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-11-13 21:19:30 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2017-11-13 21:36:23 +0100 |
commit | 2a2d4a57035823181aa14e05b1a7efe4843639cf (patch) | |
tree | ab3888817334a585b83654ed05f3ca861ef2777c | |
parent | 79742eab111e5f3722075abc3cdb1333faacd076 (diff) |
Fix typos
Change-Id: I677512213d97d01832bebe162fbf7de2998bf4d0
Reviewed-on: https://gerrit.libreoffice.org/44664
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | framework/qa/complex/framework/autosave/Protocol.java | 2 | ||||
-rw-r--r-- | framework/source/accelerators/presethandler.cxx | 2 | ||||
-rw-r--r-- | framework/source/jobs/job.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 6 | ||||
-rw-r--r-- | sal/osl/w32/module.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 8a5bd1a899a8..a2b16f36352e 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -592,7 +592,7 @@ public class Protocol extends JComponent // no else - it's a bit field of possible reactions! // But these both conditions must be handled together. // Because we can't generate different types of log contents to the same log file. - // We preferr HTML if both types are set. + // We prefer HTML if both types are set. if ( ((m_nMode & MODE_HTML ) == MODE_HTML ) || ((m_nMode & MODE_ASCII) == MODE_ASCII) diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 3afbd6c18ad7..3d6047dadaae 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -357,7 +357,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // a) inside share layer we should not create any new structures... We have to use // existing ones only! // b) inside user layer we can (SOFT mode!) but sometimes we should not (HARD mode!) - // create new empty structures. We should preferr using of any existing structure. + // create new empty structures. We should prefer using of any existing structure. sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = css::embed::ElementModes::READWRITE; diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index f7b18482dfa0..a0488bc45aae 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -182,7 +182,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD { // create the job // We must check for the supported interface on demand! - // But we preferr the synchronous one ... + // But we prefer the synchronous one ... m_xJob = m_xContext->getServiceManager()->createInstanceWithContext(m_aJobCfg.getService(), m_xContext); xSJob.set(m_xJob, css::uno::UNO_QUERY); if (!xSJob.is()) diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index ac684cf9969a..02d099d42303 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3523,7 +3523,7 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) sFeature.append(CMD_PROTOCOL); // Attention: Because "eJob" is used as a flag field the order of checking these - // flags is important. We must preferr job with higher priorities! + // flags is important. We must prefer job with higher priorities! // E.g. EmergencySave has an higher prio then AutoSave ... // On the other side there exist a well defined order between two different jobs. // e.g. PrepareEmergencySave must be done before EmergencySave is started of course. @@ -4102,7 +4102,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& { // external well known frame must be preferred (because it was created by ourself // for loading documents into this frame)! - // But if no frame exists ... we can try to locate it using any frame bound to the provided + // But if no frame exists... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this // point. But this state should not occur. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; @@ -4167,7 +4167,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& { // external well known frame must be preferred (because it was created by ourself // for loading documents into this frame)! - // But if no frame exists ... we can try to locate it using any frame bound to the provided + // But if no frame exists... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this // point. But this state should not occur. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index c6f11d2a1cf7..1a88d5cae888 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -231,7 +231,7 @@ static bool SAL_CALL osl_addressGetModuleURL_NT4_( void *pv, rtl_uString **pustr bool bSuccess = false; /* Assume failure */ /* IMAGEHELP.DLL has a bug that it recursivly scans subdirectories of - the root when calling SymInitialize(), so we preferr DBGHELP.DLL + the root when calling SymInitialize(), so we prefer DBGHELP.DLL which exports the same symbols and is shipped with OOo */ HMODULE hModImageHelp = LoadLibraryW( L"DBGHELP.DLL" ); |