vcl/aqua/source/dtrans/OSXTransferable.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 22a134b62d46843db387c786fbdd46093eec9d30 Author: Jim Jagielski <j...@apache.org> AuthorDate: Fri Jan 25 15:10:14 2019 +0000 Commit: Jim Jagielski <j...@apache.org> CommitDate: Fri Jan 25 15:10:14 2019 +0000 macOS requires SDK 10.11 and ensure correct casting diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 9a126895331e..7818c31af253 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) } 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::getTransferData( const DataFlavor& aFlavor ) 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); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits