[Libreoffice-commits] core.git: avmedia/source fpicker/source sd/source slideshow/source vcl/osx
Stephan Bergmann
sbergman at redhat.com
Wed Nov 26 09:13:31 PST 2014
avmedia/source/quicktime/framegrabber.mm | 4 ++++
avmedia/source/quicktime/player.mm | 4 ++++
avmedia/source/quicktime/window.mm | 4 ++++
fpicker/source/aqua/CFStringUtilities.mm | 2 ++
fpicker/source/aqua/ControlHelper.mm | 6 ++++++
sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 ++
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 4 ++++
vcl/osx/DragSource.cxx | 3 +++
vcl/osx/a11ywrapper.mm | 9 +++++++++
vcl/osx/salprn.cxx | 3 +++
vcl/osx/salsys.cxx | 2 ++
11 files changed, 43 insertions(+)
New commits:
commit 038683bf4cf3b6f9e4f90295ddbab2d6a3d86b25
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 26 18:12:01 2014 +0100
Silence Mac OS X 10.9/10.10 deprecations for now
Change-Id: Ie63ed8f6f66a7641ad872f93d76efb962333cec9
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 4e3e177..3a88689 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -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: */
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index d376459..79e7dd7 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -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: */
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index 0950ead..52736f0 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -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: */
diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm
index 65faf9a..de92804 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 5dc9d94..5e76fb4 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;
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index d5bf966..c559c49 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -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);
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 22fca91..754e794 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -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
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index b76dea2..593bf8b 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 aca05cb..d454b21 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 9440bb3..f8fe422 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 f10ba61..d8b676b 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];
More information about the Libreoffice-commits
mailing list