summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-26 18:12:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-26 18:13:08 +0100
commit038683bf4cf3b6f9e4f90295ddbab2d6a3d86b25 (patch)
tree0b3da6f93e513d5d6fce981261bcfaab50e0ae4f /vcl
parent210ef021f7f61d20bd1d9953916dce1f0e386970 (diff)
Silence Mac OS X 10.9/10.10 deprecations for now
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
Diffstat (limited to 'vcl')
-rw-r--r--vcl/osx/DragSource.cxx3
-rw-r--r--vcl/osx/a11ywrapper.mm9
-rw-r--r--vcl/osx/salprn.cxx3
-rw-r--r--vcl/osx/salsys.cxx2
4 files changed, 17 insertions, 0 deletions
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index b76dea2a4411..593bf8bf44b1 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -266,6 +266,8 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
g_DropSuccessSet = false;
g_DropSuccess = false;
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ //TODO: 10.7 dragImage:at:offset:event:pasteboard:source:slideBack:
[mView dragImage: dragImage
at: p
offset: NSMakeSize(0,0)
@@ -273,6 +275,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
pasteboard: clipb->getPasteboard()
source: mDragSourceHelper
slideBack: 1];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
[dragImage release];
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index aca05cb5d1a8..d454b215f395 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -241,7 +241,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
return subRole;
} else {
[ subRole release ];
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ //TODO: 10.10 accessibilityAttributeValue:
return [ super accessibilityAttributeValue: NSAccessibilitySubroleAttribute ];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
}
@@ -917,7 +920,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) {
parentAsWrapper = (AquaA11yWrapper *) parent;
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ //TODO: 10.10 accessibilityAttributeValue:
NSString * parentRole = (NSString *) [ parent accessibilityAttributeValue: NSAccessibilityRoleAttribute ];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
// if we are a textarea inside a combobox, then the combobox is the action responder
if ( enabled
&& [ role isEqualToString: NSAccessibilityTextAreaRole ]
@@ -959,8 +965,11 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
-(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point {
BOOL hit = NO;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ //TODO: 10.10 accessibilityAttributeValue:
NSValue * position = [ viewElement accessibilityAttributeValue: NSAccessibilityPositionAttribute ];
NSValue * size = [ viewElement accessibilityAttributeValue: NSAccessibilitySizeAttribute ];
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if ( position != nil && size != nil ) {
float minX = [ position pointValue ].x;
float minY = [ position pointValue ].y;
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 9440bb3eec7d..f8fe42280b84 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -630,6 +630,8 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
if( mpPrinter )
{
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH
+ //TODO: 10.9 statusForTable:, stringListForKey:inTable:
if( [mpPrinter statusForTable: @"PPD"] == NSPrinterTableOK )
{
NSArray* pPaperNames = [mpPrinter stringListForKey: @"PageSize" inTable: @"PPD"];
@@ -661,6 +663,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
}
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index f10ba61b62e0..d8b676b20702 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -150,7 +150,9 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
}
}
+ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.10 NSRunAlertPanel
int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage );
+ SAL_WNODEPRECATED_DECLARATIONS_POP
if( pTitle )
[pTitle release];