vcl/osx/OSXTransferable.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 8251b57dec1adb7f6bb76493ae446dea77651544 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 2 09:25:57 2016 +0100 const-ness mismatch (Why does that only cause a compilation failure now? DataFlavorMapper::openOfficeToSystemFlavor always returned a const NSString*. Odd.) Change-Id: I5baa577b78d024c5e959df7ec5bf477057b91c07 diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 622b2e4..df39c42 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -105,7 +105,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) } bool bInternal(false); - NSString* sysFormat = + NSString const * sysFormat = (aFlavor.MimeType.startsWith("image/png")) ? DataFlavorMapper::openOfficeImageToSystemFlavor( mPasteboard ) : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal); @@ -113,12 +113,12 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame) { - NSArray* sysData = [mPasteboard propertyListForType: sysFormat]; + NSArray* sysData = [mPasteboard propertyListForType: const_cast<NSString *>(sysFormat)]; dp = DataFlavorMapper::getDataProvider(sysFormat, sysData); } else { - NSData* sysData = [mPasteboard dataForType: sysFormat]; + NSData* sysData = [mPasteboard dataForType: const_cast<NSString *>(sysFormat)]; dp = DataFlavorMapper::getDataProvider(sysFormat, sysData); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
