strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Silence Mac OS X 10.9/10.10 deprecations for now

Browse source 
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
This commit is contained in:
Stephan Bergmann 2014-11-26 18:12:01 +01:00
parent 210ef021f7
commit 038683bf4c
11 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
avmedia/source/quicktime/framegrabber.mm
View file

@ -30,6 +30,8 @@
using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
@ -135,4 +137,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
} // namespace quicktime
} // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
avmedia/source/quicktime/player.mm
View file

@ -25,6 +25,8 @@
using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
@ -389,4 +391,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
avmedia/source/quicktime/window.mm
View file

@ -25,6 +25,8 @@
using namespace ::com::sun::star;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
static ::osl::Mutex& ImplGetOwnStaticMutex()
@ -280,4 +282,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
} // namespace quicktime
} // namespace avmedia
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
fpicker/source/aqua/CFStringUtilities.mm
View file

@ -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);

6
fpicker/source/aqua/ControlHelper.mm
View file

@ -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;

2
sd/source/ui/remotecontrol/BluetoothServer.cxx
View file

@ -1491,7 +1491,9 @@ void SAL_CALL BluetoothServer::run()
// Create service
IOBluetoothSDPServiceRecordRef serviceRecordRef;
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 IOBluetoothAddServiceDict
IOReturn rc = IOBluetoothAddServiceDict((CFDictionaryRef) dict, &serviceRecordRef);
SAL_WNODEPRECATED_DECLARATIONS_POP
SAL_INFO("sdremote.bluetooth", "IOBluetoothAddServiceDict returned " << rc);

4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
View file

@ -970,6 +970,7 @@ void OGLTransitionerImpl::impl_createTexture(
maSlideBitmapLayout.ColorSpace->convertToIntegerColorSpace(
data,
getOGLColorSpace()));
SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 gluBuild2DMipmaps
gluBuild2DMipmaps(GL_TEXTURE_2D,
4,
maSlideSize.Width,
@ -977,6 +978,7 @@ void OGLTransitionerImpl::impl_createTexture(
GL_RGBA,
GL_UNSIGNED_BYTE,
&tempBytes[0]);
SAL_WNODEPRECATED_DECLARATIONS_POP
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //TRILINEAR FILTERING
@ -990,7 +992,9 @@ void OGLTransitionerImpl::impl_createTexture(
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
} 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] );
SAL_WNODEPRECATED_DECLARATIONS_POP
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); //TRILINEAR FILTERING

3
vcl/osx/DragSource.cxx
View file

@ -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];

9
vcl/osx/a11ywrapper.mm
View file

@ -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;

3
vcl/osx/salprn.cxx
View file

@ -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
}
}

2
vcl/osx/salsys.cxx
View file

@ -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];