You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/01/25 15:10:14 UTC
svn commit: r1852140 - in /openoffice/trunk/main: configure.ac
vcl/aqua/source/dtrans/OSXTransferable.cxx
Author: jim
Date: Fri Jan 25 15:10:14 2019
New Revision: 1852140
URL: http://svn.apache.org/viewvc?rev=1852140&view=rev
Log:
macOS requires SDK 10.11 and ensure correct casting
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/vcl/aqua/source/dtrans/OSXTransferable.cxx
Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1852140&r1=1852139&r2=1852140&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Fri Jan 25 15:10:14 2019
@@ -3945,7 +3945,7 @@ if test "$_os" = "Darwin"; then
MACOSX_DEPLOYMENT_TARGET=$sdk_target
dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11|12|13|14)" | sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11)" | sed -e "s/.*sdk //" | tail -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
Modified: openoffice/trunk/main/vcl/aqua/source/dtrans/OSXTransferable.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/dtrans/OSXTransferable.cxx?rev=1852140&r1=1852139&r2=1852140&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/dtrans/OSXTransferable.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/dtrans/OSXTransferable.cxx Fri Jan 25 15:10:14 2019
@@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransfe
}
bool bInternal(false);
- NSString* sysFormat =
+ const NSString* sysFormat =
(aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0)
? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
: mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal);
@@ -93,12 +93,12 @@ Any SAL_CALL OSXTransferable::getTransfe
if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
{
- NSArray* sysData = [mPasteboard propertyListForType: sysFormat];
+ NSArray* sysData = [mPasteboard propertyListForType: (NSString*)sysFormat];
dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
}
else
{
- NSData* sysData = [mPasteboard dataForType: sysFormat];
+ NSData* sysData = [mPasteboard dataForType: (NSString*)sysFormat];
dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
}