diff options
| author | rbuj <robert.buj@gmail.com> | 2014-07-07 18:18:44 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-11 10:12:31 +0000 |
| commit | 17458019baa564c96dcd5e0bc73339c779456f94 (patch) | |
| tree | 8ed13ab2e2dd32ea23e65bd2bfca9eec5d809291 /fpicker | |
| parent | a3271394b5a537f4831a7bdd4f6b668511dec1ba (diff) | |
-Wdeprecated-declarations: first deprecated in OS X 10.10
fpicker/source/aqua/SalAquaFilePicker.mm:220:14: warning: 'NSOKButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFilePicker.mm:225:14: warning: 'NSCancelButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseCancel instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:114:10: warning: 'NSOKButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseOK instead [-Wdeprecated-declarations]
fpicker/source/aqua/SalAquaFolderPicker.mm:119:10: warning: 'NSCancelButton' is deprecated: first deprecated in OS X 10.10 - Use NSModalResponseCancel instead [-Wdeprecated-declarations]
Change-Id: Ib497903e4df868867cc56e2eade7bb2572f0902a
Reviewed-on: https://gerrit.libreoffice.org/10115
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.mm | 8 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.mm | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index 36814347814c..3e69877bc421 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -217,12 +217,20 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) switch( nStatus ) { +#if MACOSX_SDK_VERSION >= 101000 + case NSModalResponseOK: +#else case NSOKButton: +#endif OSL_TRACE("The dialog returned OK"); retVal = ExecutableDialogResults::OK; break; +#if MACOSX_SDK_VERSION >= 101000 + case NSModalResponseCancel: +#else case NSCancelButton: +#endif OSL_TRACE("The dialog was cancelled by the user!"); retVal = ExecutableDialogResults::CANCEL; break; diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 6ad8c73823bd..44f3abcc8336 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -111,12 +111,20 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException ) switch( nResult ) { +#if MACOSX_SDK_VERSION >= 101000 + case NSModalResponseOK: +#else case NSOKButton: +#endif OSL_TRACE("Dialog returned with OK"); retVal = ExecutableDialogResults::OK; break; +#if MACOSX_SDK_VERSION >= 101000 + case NSModalResponseCancel: +#else case NSCancelButton: +#endif OSL_TRACE("Dialog was cancelled!"); retVal = ExecutableDialogResults::CANCEL; break; |