This is an automated email from the ASF dual-hosted git repository. arielch pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 300bfcc48c1aee2e5a1e1c3fd1072c366bf43f0f Author: Jim Jagielski <[email protected]> AuthorDate: Fri Jan 25 15:10:14 2019 +0000 Ensure correct casting git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1852140 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 308dd811e05d8f968d4ee83245eeba8c178b0637) --- main/vcl/aqua/source/dtrans/OSXTransferable.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/vcl/aqua/source/dtrans/OSXTransferable.cxx b/main/vcl/aqua/source/dtrans/OSXTransferable.cxx index f02ce8b..7bfd04c 100644 --- a/main/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/main/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); }
