connectivity/Library_macabdrv1.mk | 2 +-
connectivity/source/drivers/macab/MacabAddressBook.cxx | 2 +-
connectivity/source/drivers/macab/MacabAddressBook.hxx | 2 +-
connectivity/source/drivers/macab/MacabGroup.hxx | 2 +-
connectivity/source/drivers/macab/MacabRecord.cxx | 4 ++--
connectivity/source/drivers/macab/MacabRecord.hxx | 2 +-
connectivity/source/drivers/macab/MacabRecords.cxx | 6 +++---
connectivity/source/drivers/macab/MacabRecords.hxx | 2 +-
connectivity/source/drivers/macab/macabutilities.hxx | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 4dc20af89779241eeae85f61b32a9b1d85c6da3e
Author: Dan Williams <d...@ioncontrol.co>
AuthorDate: Tue Sep 16 15:15:18 2025 -0500
Commit: Patrick Luby <guibomac...@gmail.com>
CommitDate: Wed Sep 17 16:13:11 2025 +0200
connectivity/macab: use CoreFoundation instead of Carbon
The Mac address book connector doesn't actually use Carbon,
so just import/link to CoreFoundation.
Signed-off-by: Dan Williams <d...@ioncontrol.co>
Change-Id: I17f42ba6a9355d45ed5c7c60214cb50d803ffbc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191051
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
diff --git a/connectivity/Library_macabdrv1.mk
b/connectivity/Library_macabdrv1.mk
index 1baf464a6055..a25e176fe18c 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -15,7 +15,7 @@ $(eval $(call
gb_Library_use_external,macabdrv1,boost_headers))
$(eval $(call gb_Library_use_sdk_api,macabdrv1))
$(eval $(call gb_Library_use_system_darwin_frameworks,macabdrv1,\
- Carbon \
+ CoreFoundation \
AddressBook \
))
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx
b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 7ade1ac0a830..699d69cdd52f 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -25,7 +25,7 @@
#include <vector>
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
#include <connectivity/CommonTools.hxx>
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx
b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index a12ba6c5be12..fb787941a1c6 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -26,7 +26,7 @@
#include <vector>
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx
b/connectivity/source/drivers/macab/MacabGroup.hxx
index a6379dda2a57..3d1f802381a2 100644
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
@@ -22,7 +22,7 @@
#include "MacabRecords.hxx"
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx
b/connectivity/source/drivers/macab/MacabRecord.cxx
index 5ac2a3c65252..2c8d1e1793be 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -23,7 +23,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
#include <connectivity/dbconversion.hxx>
@@ -182,7 +182,7 @@ sal_Int32 MacabRecord::compareFields(const macabfield
*_field1, const macabfield
CFComparisonResult result;
- /* Carbon has a unique compare function for each data type: */
+ /* CoreFoundation has a unique compare function for each data type: */
switch(_field1->type)
{
case kABStringProperty:
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx
b/connectivity/source/drivers/macab/MacabRecord.hxx
index 93d41ee92c35..bba02ca66efa 100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -28,7 +28,7 @@
#include <rtl/ustring.hxx>
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx
b/connectivity/source/drivers/macab/MacabRecords.cxx
index 612b6e9d7796..a4f2c61a8b0c 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -29,7 +29,7 @@
#include "macabutilities.hxx"
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
#include <com/sun/star/util/DateTime.hpp>
@@ -995,7 +995,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const
ABPropertyType _propertyT
OUString newPropertyName;
/* Unfortunately, the only way to get both keys and values out
- * of a dictionary in Carbon is to get them all at once, so we
+ * of a dictionary in CoreFoundation is to get them all at
once, so we
* do that.
*/
CFStringRef *dictKeys;
@@ -1033,7 +1033,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const
ABPropertyType _propertyT
* is a label and a value. All labels are strings
* (kABStringProperty), and all values have the same type
* (which is the type of the multivalue minus 255, or as
- * Carbon's list of property types has it, minus 0x100.
+ * AddressBook's list of property types has it, minus 0x100.
* We just get the correct type, then go through each element
* and get the label and value and print them in a list.
*/
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx
b/connectivity/source/drivers/macab/MacabRecords.hxx
index f38705a12e86..ec688bf8d1f6 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -28,7 +28,7 @@
#include "MacabHeader.hxx"
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
#include <com/sun/star/util/DateTime.hpp>
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx
b/connectivity/source/drivers/macab/macabutilities.hxx
index f89553c9ea27..a6dd90cc92d7 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -29,7 +29,7 @@
#include <time.h>
#include <premac.h>
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
@@ -78,7 +78,7 @@ namespace connectivity::macab
inline css::util::DateTime CFDateToDateTime(const CFDateRef _cfDate)
{
- /* Carbon can give us the time since 2001 of any CFDateRef,
+ /* CoreFoundation can give us the time since 2001 of any CFDateRef,
* and it also stores the time since 1970 as a constant,
* basically allowing us to get the unixtime of any
* CFDateRef. From there, it is just a matter of choosing what
