diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 18:12:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 18:13:08 +0100 |
| commit | 038683bf4cf3b6f9e4f90295ddbab2d6a3d86b25 (patch) | |
| tree | 0b3da6f93e513d5d6fce981261bcfaab50e0ae4f /fpicker | |
| parent | 210ef021f7f61d20bd1d9953916dce1f0e386970 (diff) | |
Silence Mac OS X 10.9/10.10 deprecations for now
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/CFStringUtilities.mm | 2 | ||||
| -rw-r--r-- | fpicker/source/aqua/ControlHelper.mm | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm index 65faf9a93c50..de9280426174 100644 --- a/fpicker/source/aqua/CFStringUtilities.mm +++ b/fpicker/source/aqua/CFStringUtilities.mm @@ -58,7 +58,9 @@ rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info) { //DBG_PRINT_ENTRY("CFStringUtilities", __func__); + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef); + SAL_WNODEPRECATED_DECLARATIONS_POP rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info); diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index 5dc9d94877b7..5e76fb44cbd7 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -204,7 +204,9 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId ) retVal = [temp OUString]; } else { + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 title NSString* sLabel = [[pControl cell] title]; + SAL_WNODEPRECATED_DECLARATIONS_POP retVal = [sLabel OUString]; } @@ -232,7 +234,9 @@ void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel ) m_aMapListLabels[pControl] = [aLabel retain]; } else if ([pControl class] == [NSButton class]) { + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle [[pControl cell] setTitle:aLabel]; + SAL_WNODEPRECATED_DECLARATIONS_POP } } else { SAL_INFO("fpicker.aqua","Control not found to set label for"); @@ -952,7 +956,9 @@ NSTextField* ControlHelper::createLabelWithString(NSString* labelString) { [textField setSelectable:NO]; [textField setDrawsBackground:NO]; [textField setBordered:NO]; + SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle [[textField cell] setTitle:labelString]; + SAL_WNODEPRECATED_DECLARATIONS_POP DBG_PRINT_EXIT(CLASS_NAME, __func__); return textField; |