summaryrefslogtreecommitdiff
path: root/connectivity
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 /connectivity
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 'connectivity')
-rw-r--r--connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java4
-rw-r--r--connectivity/source/drivers/macab/MacabConnection.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabGroup.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabRecords.hxx2
5 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 59541556b185..e8ea8d44eea2 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -33,10 +33,10 @@ final class NativeLibraries {
}
private static void loadLibrary(String libname) {
- // At least on Mac OS X Tiger, System.loadLibrary("hsqldb2") does not
+ // At least on macOS Tiger, System.loadLibrary("hsqldb2") does not
// find the hsqldb2 library one directory above sdbc_hsqldb.jar, even
// though ".." is on the jar's Class-Path; however, the alternative
- // code (needing Java 1.5, which is given for Mac OS X Tiger) works
+ // code (needing Java 1.5, which is given for macOS Tiger) works
// there:
try {
System.loadLibrary(libname);
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index eeea86def136..e55d342584d8 100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -57,7 +57,7 @@ void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >
{
osl_atomic_increment( &m_refCount );
- // get the Mac OS X shared address book
+ // get the macOS shared address book
m_pAddressBook = new MacabAddressBook();
osl_atomic_decrement( &m_refCount );
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index f4217b018aac..a57f1729fc2d 100644
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -27,7 +27,7 @@ using namespace connectivity::macab;
/* A MacabGroup is basically a MacabRecords with a different constructor.
* It only exists as a different entity for clarification purposes (a group
- * is its own entity in the Mac OS X Address Book) and because its
+ * is its own entity in the macOS Address Book) and because its
* construction is so unique (it is based on an already existent
* MacabRecords of the entire address book).
*/
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 675757cf629c..19fa868a2b28 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -349,7 +349,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
* at least one record in the set has that property filled. The reason
* is that some properties, like the kABTitleProperty are required by
* the mail merge wizard (in module sw) but are by default not shown in
- * the Mac OS X address book, so they would be weeded out at this stage
+ * the macOS address book, so they would be weeded out at this stage
* and not shown if they were not required.
*
* Note: with the addition of required properties, I am not sure that
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 9fe357b6f850..1e7d9975de15 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -69,7 +69,7 @@ namespace connectivity
/* All of the private methods are for creating a MacabHeader or a
* MacabRecord. They are used by the initialize method that goes
* about filling a MacabRecords using all of the records in the
- * Mac OS X Address Book.
+ * macOS Address Book.
*/
void bootstrap_CF_types();
void bootstrap_requiredProperties();