Kaydet (Commit) 038683bf authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Silence Mac OS X 10.9/10.10 deprecations for now

Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
üst 210ef021
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
...@@ -135,4 +137,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames ...@@ -135,4 +137,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
} // namespace quicktime } // namespace quicktime
} // namespace avmedia } // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
...@@ -389,4 +391,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) ...@@ -389,4 +391,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
} // namespace quicktime } // namespace quicktime
} // namespace avmedia } // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime { namespace avmedia { namespace quicktime {
static ::osl::Mutex& ImplGetOwnStaticMutex() static ::osl::Mutex& ImplGetOwnStaticMutex()
...@@ -280,4 +282,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) ...@@ -280,4 +282,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
} // namespace quicktime } // namespace quicktime
} // namespace avmedia } // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -58,7 +58,9 @@ rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info) ...@@ -58,7 +58,9 @@ rtl::OUString FSRefToOUString(FSRef fsRef, InfoType info)
{ {
//DBG_PRINT_ENTRY("CFStringUtilities", __func__); //DBG_PRINT_ENTRY("CFStringUtilities", __func__);
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef
CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef); CFURLRef aUrlRef = CFURLCreateFromFSRef(NULL, &fsRef);
SAL_WNODEPRECATED_DECLARATIONS_POP
rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info); rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
......
...@@ -204,7 +204,9 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId ) ...@@ -204,7 +204,9 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
retVal = [temp OUString]; retVal = [temp OUString];
} }
else { else {
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 title
NSString* sLabel = [[pControl cell] title]; NSString* sLabel = [[pControl cell] title];
SAL_WNODEPRECATED_DECLARATIONS_POP
retVal = [sLabel OUString]; retVal = [sLabel OUString];
} }
...@@ -232,7 +234,9 @@ void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel ) ...@@ -232,7 +234,9 @@ void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
m_aMapListLabels[pControl] = [aLabel retain]; m_aMapListLabels[pControl] = [aLabel retain];
} else if ([pControl class] == [NSButton class]) { } else if ([pControl class] == [NSButton class]) {
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle
[[pControl cell] setTitle:aLabel]; [[pControl cell] setTitle:aLabel];
SAL_WNODEPRECATED_DECLARATIONS_POP
} }
} else { } else {
SAL_INFO("fpicker.aqua","Control not found to set label for"); SAL_INFO("fpicker.aqua","Control not found to set label for");
...@@ -952,7 +956,9 @@ NSTextField* ControlHelper::createLabelWithString(NSString* labelString) { ...@@ -952,7 +956,9 @@ NSTextField* ControlHelper::createLabelWithString(NSString* labelString) {
[textField setSelectable:NO]; [textField setSelectable:NO];
[textField setDrawsBackground:NO]; [textField setDrawsBackground:NO];
[textField setBordered:NO]; [textField setBordered:NO];
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 setTitle
[[textField cell] setTitle:labelString]; [[textField cell] setTitle:labelString];
SAL_WNODEPRECATED_DECLARATIONS_POP
DBG_PRINT_EXIT(CLASS_NAME, __func__); DBG_PRINT_EXIT(CLASS_NAME, __func__);
return textField; return textField;
......
...@@ -1491,7 +1491,9 @@ void SAL_CALL BluetoothServer::run() ...@@ -1491,7 +1491,9 @@ void SAL_CALL BluetoothServer::run()
// Create service // Create service
IOBluetoothSDPServiceRecordRef serviceRecordRef; IOBluetoothSDPServiceRecordRef serviceRecordRef;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 IOBluetoothAddServiceDict
IOReturn rc = IOBluetoothAddServiceDict((CFDictionaryRef) dict, &serviceRecordRef); IOReturn rc = IOBluetoothAddServiceDict((CFDictionaryRef) dict, &serviceRecordRef);
SAL_WNODEPRECATED_DECLARATIONS_POP
SAL_INFO("sdremote.bluetooth", "IOBluetoothAddServiceDict returned " << rc); SAL_INFO("sdremote.bluetooth", "IOBluetoothAddServiceDict returned " << rc);
......
...@@ -970,6 +970,7 @@ void OGLTransitionerImpl::impl_createTexture( ...@@ -970,6 +970,7 @@ void OGLTransitionerImpl::impl_createTexture(
maSlideBitmapLayout.ColorSpace->convertToIntegerColorSpace( maSlideBitmapLayout.ColorSpace->convertToIntegerColorSpace(
data, data,
getOGLColorSpace())); getOGLColorSpace()));
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 gluBuild2DMipmaps
gluBuild2DMipmaps(GL_TEXTURE_2D, gluBuild2DMipmaps(GL_TEXTURE_2D,
4, 4,
maSlideSize.Width, maSlideSize.Width,
...@@ -977,6 +978,7 @@ void OGLTransitionerImpl::impl_createTexture( ...@@ -977,6 +978,7 @@ void OGLTransitionerImpl::impl_createTexture(
GL_RGBA, GL_RGBA,
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
&tempBytes[0]); &tempBytes[0]);
SAL_WNODEPRECATED_DECLARATIONS_POP
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING
...@@ -990,7 +992,9 @@ void OGLTransitionerImpl::impl_createTexture( ...@@ -990,7 +992,9 @@ void OGLTransitionerImpl::impl_createTexture(
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
} else { } else {
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 gluBuild2DMipmaps
gluBuild2DMipmaps( GL_TEXTURE_2D, pFormat->nInternalFormat, maSlideSize.Width, maSlideSize.Height, pFormat->eFormat, pFormat->eType, &data[0] ); gluBuild2DMipmaps( GL_TEXTURE_2D, pFormat->nInternalFormat, maSlideSize.Width, maSlideSize.Height, pFormat->eFormat, pFormat->eType, &data[0] );
SAL_WNODEPRECATED_DECLARATIONS_POP
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); //TRILINEAR FILTERING glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); //TRILINEAR FILTERING
......
...@@ -266,6 +266,8 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, ...@@ -266,6 +266,8 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
g_DropSuccessSet = false; g_DropSuccessSet = false;
g_DropSuccess = false; g_DropSuccess = false;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
//TODO: 10.7 dragImage:at:offset:event:pasteboard:source:slideBack:
[mView dragImage: dragImage [mView dragImage: dragImage
at: p at: p
offset: NSMakeSize(0,0) offset: NSMakeSize(0,0)
...@@ -273,6 +275,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, ...@@ -273,6 +275,7 @@ void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
pasteboard: clipb->getPasteboard() pasteboard: clipb->getPasteboard()
source: mDragSourceHelper source: mDragSourceHelper
slideBack: 1]; slideBack: 1];
SAL_WNODEPRECATED_DECLARATIONS_POP
[dragImage release]; [dragImage release];
......
...@@ -241,7 +241,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) { ...@@ -241,7 +241,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
return subRole; return subRole;
} else { } else {
[ subRole release ]; [ subRole release ];
SAL_WNODEPRECATED_DECLARATIONS_PUSH
//TODO: 10.10 accessibilityAttributeValue:
return [ super accessibilityAttributeValue: NSAccessibilitySubroleAttribute ]; return [ super accessibilityAttributeValue: NSAccessibilitySubroleAttribute ];
SAL_WNODEPRECATED_DECLARATIONS_POP
} }
} }
} }
...@@ -917,7 +920,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) { ...@@ -917,7 +920,10 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) { if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) {
parentAsWrapper = (AquaA11yWrapper *) parent; parentAsWrapper = (AquaA11yWrapper *) parent;
} }
SAL_WNODEPRECATED_DECLARATIONS_PUSH
//TODO: 10.10 accessibilityAttributeValue:
NSString * parentRole = (NSString *) [ parent accessibilityAttributeValue: NSAccessibilityRoleAttribute ]; 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 we are a textarea inside a combobox, then the combobox is the action responder
if ( enabled if ( enabled
&& [ role isEqualToString: NSAccessibilityTextAreaRole ] && [ role isEqualToString: NSAccessibilityTextAreaRole ]
...@@ -959,8 +965,11 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) { ...@@ -959,8 +965,11 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
-(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point { -(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point {
BOOL hit = NO; BOOL hit = NO;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
SAL_WNODEPRECATED_DECLARATIONS_PUSH
//TODO: 10.10 accessibilityAttributeValue:
NSValue * position = [ viewElement accessibilityAttributeValue: NSAccessibilityPositionAttribute ]; NSValue * position = [ viewElement accessibilityAttributeValue: NSAccessibilityPositionAttribute ];
NSValue * size = [ viewElement accessibilityAttributeValue: NSAccessibilitySizeAttribute ]; NSValue * size = [ viewElement accessibilityAttributeValue: NSAccessibilitySizeAttribute ];
SAL_WNODEPRECATED_DECLARATIONS_POP
if ( position != nil && size != nil ) { if ( position != nil && size != nil ) {
float minX = [ position pointValue ].x; float minX = [ position pointValue ].x;
float minY = [ position pointValue ].y; float minY = [ position pointValue ].y;
......
...@@ -630,6 +630,8 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) ...@@ -630,6 +630,8 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
if( mpPrinter ) if( mpPrinter )
{ {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
//TODO: 10.9 statusForTable:, stringListForKey:inTable:
if( [mpPrinter statusForTable: @"PPD"] == NSPrinterTableOK ) if( [mpPrinter statusForTable: @"PPD"] == NSPrinterTableOK )
{ {
NSArray* pPaperNames = [mpPrinter stringListForKey: @"PageSize" inTable: @"PPD"]; NSArray* pPaperNames = [mpPrinter stringListForKey: @"PageSize" inTable: @"PPD"];
...@@ -661,6 +663,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) ...@@ -661,6 +663,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
} }
} }
} }
SAL_WNODEPRECATED_DECLARATIONS_POP
} }
} }
......
...@@ -150,7 +150,9 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle, ...@@ -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 ); int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage );
SAL_WNODEPRECATED_DECLARATIONS_POP
if( pTitle ) if( pTitle )
[pTitle release]; [pTitle release];
......
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