diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2014-11-10 15:05:25 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-12 11:04:11 +0000 |
commit | da40cac540e7d735edbe9069b3c8ec6af4530208 (patch) | |
tree | f2abda7281129e13f588c77b18780a7090c8405f /jvmfwk | |
parent | bb437029c1e5331bcc3f8fb2fc87837142a52f33 (diff) |
Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959
Reviewed-on: https://gerrit.libreoffice.org/12164
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 8 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/elements.hxx | 2 | ||||
-rw-r--r-- | jvmfwk/source/framework.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 504c16c9e0e6..09833e106c89 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -55,7 +55,7 @@ SunVersion::SunVersion(const char * szVer): } -/**Format major.minor.maintainance_update +/**Format major.minor.maintenance_update */ bool SunVersion::init(const char *szVersion) { @@ -86,10 +86,10 @@ bool SunVersion::init(const char *szVersion) else if ( ! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit && ( - //separators after maintainance (1.4.1_01, 1.4.1-beta, or1.4.1 + //separators after maintenance (1.4.1_01, 1.4.1-beta, or 1.4.1) ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 )) || - //separators between major-minor and minor-maintainance + //separators between major-minor and minor-maintenance (nPart < 2 && *pCur == '.') ) && ( //prevent 1.4.0. 1.4.0- @@ -270,7 +270,7 @@ bool SunVersion::operator > (const SunVersion& ver) const return false; } } - //major.minor.maintainance_update are equal. test for a trailing char + //major.minor.maintenance_update are equal. Test for a trailing char if (m_nUpdateSpecial > ver.m_nUpdateSpecial) { return true; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 46f39113a7f4..1a2173dd3c4c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -698,7 +698,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec) } catch (MalformedVersionException & ) { - //The second version is invalid, therefore it is regardes less. + //The second version is invalid, therefore it regards less. nCmp = 1; } } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx index 7b1830909566..0f0bf04f2619 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx @@ -95,7 +95,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(const OUString& path); first if the path corresponds to one of the VendorBase::getHome path already contained in vecInfo. Only if there is no such entry, then the other getJREInfoByPath is called. Again the created VendorBase is compared to - those contained in vecInfos. If it it not in there then it's added. + those contained in vecInfos. If it is not in there then it's added. @return true a VendorBase was created and added to the end of vecInfos. diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 28abbaef7291..d81874d426cd 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -120,7 +120,7 @@ private: /** creates settings file and fills it with default values. When this function is called then it creates the - settings file at the possition determined by the bootstrap parameters + settings file at the position determined by the bootstrap parameters (UNO_JAVA_JFW_USER_DATA, UNO_JAVA_JFW_SHARED_DATA) and m_layer, unless the file already exists (see createSettingsDocument). diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index a604164bd741..00b6f99c3090 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -266,7 +266,7 @@ javaFrameworkError SAL_CALL jfw_startVM( //check if JAVA is disabled //If Java is enabled, but it was disabled when this process was started // then no preparational work, such as setting the LD_LIBRARY_PATH, was - //done. Therefore if a JRE needs it it must not be started. + //done. Therefore if a JRE needs it, it must not be started. if (g_bEnabledSwitchedOn && (aInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)) return JFW_E_NEED_RESTART; |