summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-27 11:40:49 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-29 14:08:26 +0100
commit9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch)
treea2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /jvmfwk
parenta55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff)
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm8
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx2
3 files changed, 9 insertions, 9 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 02cd94b295d2..36dd03877c0d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -399,7 +399,7 @@ bool getJavaProps(const OUString & exePath,
OUString usStartDir;
//We need to set the CLASSPATH in case the office is started from
//a different directory. The JREProperties.class is expected to reside
- //next to the plugin, except on OS X where it is in ../Resources/java relative
+ //next to the plugin, except on macOS where it is in ../Resources/java relative
//to the plugin.
OUString sThisLib;
if (!osl_getModuleURLFromAddress(reinterpret_cast<void *>(&getJavaProps),
@@ -1137,7 +1137,7 @@ void addJavaInfoFromJavaHome(
#if !defined JVM_ONE_PATH_CHECK
// Get Java from JAVA_HOME environment
- // Note that on OS X is it not normal at all to have a JAVA_HOME environment
+ // Note that on macOS is it not normal at all to have a JAVA_HOME environment
// variable. We set it in our build environment for build-time programs, though,
// so it is set when running unit tests that involve Java functionality. (Which affects
// at least CppunitTest_dbaccess_dialog_save, too, and not only the JunitTest ones.)
@@ -1188,8 +1188,8 @@ void addJavaInfosDirScan(
{
#ifdef MACOSX
// Ignore all but Oracle's JDK as loading Apple's Java and Oracle's JRE
- // will cause OS X's JavaVM framework to display a dialog and invoke
- // exit() when loaded via JNI on OS X 10.10
+ // will cause macOS's JavaVM framework to display a dialog and invoke
+ // exit() when loaded via JNI on macOS 10.10
Directory aDir("file:///Library/Java/JavaVirtualMachines");
if (aDir.open() == File::E_None)
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
index 5a5d7303a18a..136518253cde 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm
@@ -24,8 +24,8 @@ bool JvmfwkUtil_isLoadableJVM( OUString const & aURL )
NSURL *pURL = nil;
// Ignore all but Oracle's JDK as loading Apple's Java and Oracle's
- // JRE will cause OS X's JavaVM framework to display a dialog and
- // invoke exit() when loaded via JNI on OS X 10.10
+ // JRE will cause macOS's JavaVM framework to display a dialog and
+ // invoke exit() when loaded via JNI on macOS 10.10
NSURL *pTmpURL = [NSURL URLWithString:pString];
if ( pTmpURL )
pTmpURL = [pTmpURL filePathURL];
@@ -69,9 +69,9 @@ bool JvmfwkUtil_isLoadableJVM( OUString const & aURL )
// Make sure that this bundle's Info.plist has the
// proper JVM keys to supports loading via JNI. If
// this bundle is a valid JVM and these keys
- // are missing, loading the JVM will cause OS X's
+ // are missing, loading the JVM will cause macOS's
// JavaVM framework to display a dialog and invoke
- // exit() when loaded via JNI on OS X 10.10.
+ // exit() when loaded via JNI on macOS 10.10.
NSDictionary *pInfo = [pBundle infoDictionary];
if ( pInfo )
{
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 608be1583b8e..e44997625df1 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -35,7 +35,7 @@ namespace jfw_plugin
by "\xXX\xXX"
*/
BEGIN_VENDOR_MAP()
-// For OS X, don't bother with implementations that aren't relevant (or have never existed)
+// For macOS, don't bother with implementations that aren't relevant (or have never existed)
#ifdef MACOSX
VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)