strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for macOS SDK 12.0

Browse source 
...and for now just silence all the new deprecation warnings

Change-Id: Ic6e04f4bade91a823872cd4e453c41ee1950bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124275
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2021-10-27 14:10:02 +02:00
parent 13b2d160ec
commit 323a2a249a
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apple_remote/source/HIDRemoteControlDevice.m
View file

@ -507,7 +507,9 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]); hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]);
// Now search I/O Registry for matching devices. // Now search I/O Registry for matching devices.
SAL_WNODEPRECATED_DECLARATIONS_PUSH // kIOMasterPortDefault (12.0)
ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator); ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
SAL_WNODEPRECATED_DECLARATIONS_POP
if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) { if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
hidDevice = IOIteratorNext(hidObjectIterator); hidDevice = IOIteratorNext(hidObjectIterator);

2
apple_remote/source/KeyspanFrontRowControl.m
View file

@ -81,7 +81,9 @@
} }
// Now search I/O Registry for matching devices. // Now search I/O Registry for matching devices.
SAL_WNODEPRECATED_DECLARATIONS_PUSH // kIOMasterPortDefault (12.0)
ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator); ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
SAL_WNODEPRECATED_DECLARATIONS_POP
if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) { if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
hidDevice = IOIteratorNext(hidObjectIterator); hidDevice = IOIteratorNext(hidObjectIterator);

2
avmedia/source/macavf/framegrabber.mm
View file

@ -67,7 +67,9 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
// convert the image to a TIFF-formatted byte-array // convert the image to a TIFF-formatted byte-array
CFMutableDataRef pCFData = CFDataCreateMutable( kCFAllocatorDefault, 0 ); CFMutableDataRef pCFData = CFDataCreateMutable( kCFAllocatorDefault, 0 );
SAL_WNODEPRECATED_DECLARATIONS_PUSH // kUTTypeTIFF (12.0)
CGImageDestination* pCGImgDest = CGImageDestinationCreateWithData( pCFData, kUTTypeTIFF, 1, nullptr ); CGImageDestination* pCGImgDest = CGImageDestinationCreateWithData( pCFData, kUTTypeTIFF, 1, nullptr );
SAL_WNODEPRECATED_DECLARATIONS_POP
CGImageDestinationAddImage( pCGImgDest, pCGImage, nullptr ); CGImageDestinationAddImage( pCGImgDest, pCGImage, nullptr );
CGImageDestinationFinalize( pCGImgDest ); CGImageDestinationFinalize( pCGImgDest );
CFRelease( pCGImgDest ); CFRelease( pCGImgDest );

4
fpicker/source/aqua/SalAquaFilePicker.mm
View file

@ -539,7 +539,9 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
if (!m_pControlHelper->isAutoExtensionEnabled()) { if (!m_pControlHelper->isAutoExtensionEnabled()) {
SAL_WNODEPRECATED_DECLARATIONS_PUSH // setAllowedFileTypes (12.0)
[m_pDialog setAllowedFileTypes:nil]; [m_pDialog setAllowedFileTypes:nil];
SAL_WNODEPRECATED_DECLARATIONS_POP
[m_pDialog setAllowsOtherFileTypes:YES]; [m_pDialog setAllowsOtherFileTypes:YES];
} else { } else {
ensureFilterHelper(); ensureFilterHelper();
@ -551,7 +553,9 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
OUString suffix = (*(aStringList.begin())).copy(1); OUString suffix = (*(aStringList.begin())).copy(1);
NSString *requiredFileType = [NSString stringWithOUString:suffix]; NSString *requiredFileType = [NSString stringWithOUString:suffix];
SAL_WNODEPRECATED_DECLARATIONS_PUSH // setAllowedFileTypes (12.0)
[m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]]; [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]];
SAL_WNODEPRECATED_DECLARATIONS_POP
[m_pDialog setAllowsOtherFileTypes:NO]; [m_pDialog setAllowsOtherFileTypes:NO];
} }