Skip to content

C
core
Kaydet (Commit) 22a134b6 authored tarafından Jim Jagielski's avatar Jim Jagielski
Dosyalara gözat
Seçenekler

macOS requires SDK 10.11 and ensure correct casting

üst 2a8c9c81
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vcl/aqua/source/dtrans/OSXTransferable.cxx
Dosyayı görüntüle @ 22a134b6
...@@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) ...@@ -85,7 +85,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
} }
bool bInternal(false); bool bInternal(false);
NSString* sysFormat = const NSString* sysFormat =
(aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0) (aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0)
? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard ) ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
: mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal); : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal);
...@@ -93,12 +93,12 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) ...@@ -93,12 +93,12 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame) if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
{ {
NSArray* sysData = [mPasteboard propertyListForType: sysFormat]; NSArray* sysData = [mPasteboard propertyListForType: (NSString*)sysFormat];
dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData); dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
} }
else else
{ {
NSData* sysData = [mPasteboard dataForType: sysFormat]; NSData* sysData = [mPasteboard dataForType: (NSString*)sysFormat];
dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData); dp = mDataFlavorMapper->getDataProvider(sysFormat, sysData);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment