Kaydet (Commit) 17458019 authored tarafından rbuj's avatar rbuj Kaydeden (comit) Caolán McNamara

-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/10115Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a3271394
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment