diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-27 14:10:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-27 16:32:04 +0200 |
| commit | 323a2a249a6c87ffde52a1e826d5d12be649e018 (patch) | |
| tree | 90cec5b4284aef7b12df1b970c473dee29d737f6 | |
| parent | 13b2d160ec41ecce118e419d3bcab8004d4d858d (diff) | |
Add support for macOS SDK 12.0
...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>
| -rw-r--r-- | apple_remote/source/HIDRemoteControlDevice.m | 2 | ||||
| -rw-r--r-- | apple_remote/source/KeyspanFrontRowControl.m | 2 | ||||
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 2 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 4 |
4 files changed, 10 insertions, 0 deletions
diff --git a/apple_remote/source/HIDRemoteControlDevice.m b/apple_remote/source/HIDRemoteControlDevice.m index 6ed20b8eb6bf..56e2b930d137 100644 --- a/apple_remote/source/HIDRemoteControlDevice.m +++ b/apple_remote/source/HIDRemoteControlDevice.m @@ -507,7 +507,9 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon, hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]); // Now search I/O Registry for matching devices. + SAL_WNODEPRECATED_DECLARATIONS_PUSH // kIOMasterPortDefault (12.0) ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator); + SAL_WNODEPRECATED_DECLARATIONS_POP if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) { hidDevice = IOIteratorNext(hidObjectIterator); diff --git a/apple_remote/source/KeyspanFrontRowControl.m b/apple_remote/source/KeyspanFrontRowControl.m index a337c497844f..46bc7917486a 100644 --- a/apple_remote/source/KeyspanFrontRowControl.m +++ b/apple_remote/source/KeyspanFrontRowControl.m @@ -81,7 +81,9 @@ } // Now search I/O Registry for matching devices. + SAL_WNODEPRECATED_DECLARATIONS_PUSH // kIOMasterPortDefault (12.0) ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator); + SAL_WNODEPRECATED_DECLARATIONS_POP if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) { hidDevice = IOIteratorNext(hidObjectIterator); diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 7803fa4f1063..e0b8bad61171 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -67,7 +67,9 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe // convert the image to a TIFF-formatted byte-array CFMutableDataRef pCFData = CFDataCreateMutable( kCFAllocatorDefault, 0 ); + SAL_WNODEPRECATED_DECLARATIONS_PUSH // kUTTypeTIFF (12.0) CGImageDestination* pCGImgDest = CGImageDestinationCreateWithData( pCFData, kUTTypeTIFF, 1, nullptr ); + SAL_WNODEPRECATED_DECLARATIONS_POP CGImageDestinationAddImage( pCGImgDest, pCGImage, nullptr ); CGImageDestinationFinalize( pCGImgDest ); CFRelease( pCGImgDest ); diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 6c16b04fc702..fa2ec600c2ec 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -539,7 +539,9 @@ void SalAquaFilePicker::updateSaveFileNameExtension() SolarMutexGuard aGuard; if (!m_pControlHelper->isAutoExtensionEnabled()) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH // setAllowedFileTypes (12.0) [m_pDialog setAllowedFileTypes:nil]; + SAL_WNODEPRECATED_DECLARATIONS_POP [m_pDialog setAllowsOtherFileTypes:YES]; } else { ensureFilterHelper(); @@ -551,7 +553,9 @@ void SalAquaFilePicker::updateSaveFileNameExtension() OUString suffix = (*(aStringList.begin())).copy(1); NSString *requiredFileType = [NSString stringWithOUString:suffix]; + SAL_WNODEPRECATED_DECLARATIONS_PUSH // setAllowedFileTypes (12.0) [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]]; + SAL_WNODEPRECATED_DECLARATIONS_POP [m_pDialog setAllowsOtherFileTypes:NO]; } |