[Libreoffice-commits] core.git: fpicker/source

[Tor Lillqvist (via logerrit)]

 fpicker/source/aqua/SalAquaPicker.mm |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4a7b8a981d3155427dd669e5409b7f107c5f3554
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Oct 21 12:18:47 2021 +0300
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Oct 21 12:54:53 2021 +0200

    Use NSModalResponseOK instead of deprecated NSFileHandlingPanelOKButton
    
    NSFileHandlingPanelOKButton is defined as NSModalResponseOK in
    NSSavePanel.h:
    
    NSFileHandlingPanelOKButton     
API_DEPRECATED_WITH_REPLACEMENT("NSModalResponseOK", macos(10.0,10.13)) = 
NSModalResponseOK,
    
    For some reason, when as a test I just removed the
    SAL_WNODEPRECATED_DECLARATIONS_PUSH and _POP lines, I still did not
    get any depreation warning about NSFileHandlingPanelOKButton. I wonder
    if there is some problem in latest Xcode or in our build system that
    means we don't get any deprecation warnings at all any more on macOS.
    
    Change-Id: Ia61dd9f800eb7d251508dbd491a9c48c8e6118f4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123964
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <t...@collabora.com>

diff --git a/fpicker/source/aqua/SalAquaPicker.mm 
b/fpicker/source/aqua/SalAquaPicker.mm
index 713d6d2ade13..5011c194db15 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -163,10 +163,7 @@ int SalAquaPicker::run()
             break;
     }
 
-    SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        //TODO: 10.13 NSFileHandlingPanelOKButton
-    if (retVal == NSFileHandlingPanelOKButton) {
-    SAL_WNODEPRECATED_DECLARATIONS_POP
+    if (retVal == NSModalResponseOK) {
         NSURL* pDir = [m_pDialog directoryURL];
         if (pDir) {
             implsetDisplayDirectory([pDir OUString]);