vcl109: #i108454# do not depend on onsolete PICT format as image clipboard content

5 files changed, 155 insertions, 21 deletions

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index af05f084a97e..d69b83a58394 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -45,7 +45,7 @@
 #include <stdio.h>
 
 #include <premac.h>
-#include <QuickTime/QuickTime.h>
+#include <Cocoa/Cocoa.h>
 #include <postmac.h>
 
 using namespace ::com::sun::star::datatransfer;
@@ -132,6 +132,7 @@ namespace // private
     {
       { NSStringPboardType, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING },
       { NSRTFPboardType, "text/richtext", "Rich Text Format", CPPUTYPE_SEQINT8 },
+      { NSTIFFPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
       { NSPICTPboardType, "image/bmp", "Windows Bitmap", CPPUTYPE_SEQINT8 },
       { NSHTMLPboardType, "text/html", "Plain Html", CPPUTYPE_SEQINT8 },
       { NSFilenamesPboardType, "application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", CPPUTYPE_SEQINT8 },
@@ -146,9 +147,6 @@ namespace // private
       { PBTYPE_EMF, FLAVOR_EMF, "Windows Enhanced MetaFile", CPPUTYPE_SEQINT8 },
       { PBTYPE_SODX, FLAVOR_SODX, "Star Object Descriptor (XML)", CPPUTYPE_SEQINT8 },
       { PBTYPE_DUMMY_INTERNAL, FLAVOR_DUMMY_INTERNAL, "internal data",CPPUTYPE_SEQINT8 }
-      //      { PBTYPE_UT16, "text/plain;charset=utf-16", "Unicode Text (UTF-16)", CPPUTYPE_OUSTRING }
-      //      { kUTTypePICT, @"PICT", "image/x-macpict;windows_formatname=\"Mac Pict\"", "Mac Pict", CPPUTYPE_SEQINT8 }
-      //      { kUTTypeHTML, @"HTML", "text/html", "Plain Html", CPPUTYPE_SEQINT8 }
     };
 
 
@@ -382,23 +380,26 @@ Any HTMLFormatDataProvider::getOOoData()
 
 class BMPDataProvider : public DataProviderBaseImpl
 {
+    NSBitmapImageFileType meImageType;
 public:
-  BMPDataProvider(const Any& data);
+  BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType );
 
-  BMPDataProvider(NSData* data);
+  BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType);
 
   virtual NSData* getSystemData();
 
   virtual Any getOOoData();
 };
 
-BMPDataProvider::BMPDataProvider(const Any& data) :
-  DataProviderBaseImpl(data)
+BMPDataProvider::BMPDataProvider(const Any& data, NSBitmapImageFileType eImageType) :
+  DataProviderBaseImpl(data),
+  meImageType( eImageType )
 {
 }
 
-BMPDataProvider::BMPDataProvider(NSData* data) :
-  DataProviderBaseImpl(data)
+BMPDataProvider::BMPDataProvider(NSData* data, NSBitmapImageFileType eImageType) :
+  DataProviderBaseImpl(data),
+  meImageType( eImageType )
 {
 }
 
@@ -410,7 +411,7 @@ NSData* BMPDataProvider::getSystemData()
   Sequence<sal_Int8> pictData;
   NSData* sysData = NULL;
 
-  if (BMPtoPICT(bmpData, pictData))
+  if (BMPToImage(bmpData, pictData, meImageType))
     {
       sysData = [NSData dataWithBytes: pictData.getArray() length: pictData.getLength()];
     }
@@ -436,7 +437,7 @@ Any BMPDataProvider::getOOoData()
 
       Sequence<sal_Int8> bmpData;
 
-      if (PICTtoBMP(pictData, bmpData))
+      if (ImageToBMP(pictData, bmpData, meImageType))
         {
           oOOData = makeAny(bmpData);
         }
@@ -558,6 +559,13 @@ NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor
   return sysFlavor;
 }
 
+NSString* DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard* pPasteboard) const
+{
+    NSArray *supportedTypes = [NSArray arrayWithObjects: NSTIFFPboardType, NSPICTPboardType, nil];
+    NSString *sysFlavor = [pPasteboard availableTypeFromArray:supportedTypes];
+    return sysFlavor;
+}
+
 DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Reference<XTransferable> rTransferable) const
 {
   DataProviderPtr_t dp;
@@ -576,7 +584,11 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
             }
           else if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
             {
-              dp = DataProviderPtr_t(new BMPDataProvider(data));
+              dp = DataProviderPtr_t(new BMPDataProvider(data, PICTImageFileType));
+            }
+          else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
+            {
+              dp = DataProviderPtr_t(new BMPDataProvider(data, NSTIFFFileType));
             }
           else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
             {
@@ -621,7 +633,11 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor
     }
   else if ([systemFlavor caseInsensitiveCompare: NSPICTPboardType] == NSOrderedSame)
     {
-      dp = DataProviderPtr_t(new BMPDataProvider(systemData));
+      dp = DataProviderPtr_t(new BMPDataProvider(systemData, PICTImageFileType));
+    }
+  else if ([systemFlavor caseInsensitiveCompare: NSTIFFPboardType] == NSOrderedSame)
+    {
+      dp = DataProviderPtr_t(new BMPDataProvider(systemData, NSTIFFFileType));
     }
   else if ([systemFlavor caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
     {
@@ -658,11 +674,19 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
 
   for (sal_uInt32 i = 0; i < nFlavors; i++)
   {
-      NSString* str = openOfficeToSystemFlavor(flavors[i]);
-
-      if (str != NULL)
+      if( flavors[i].MimeType.compareToAscii( "image/bmp", 9 ) == 0 )
       {
-          [array addObject: str];
+          [array addObject: NSTIFFPboardType];
+          [array addObject: NSPICTPboardType];
+      }
+      else
+      {
+          NSString* str = openOfficeToSystemFlavor(flavors[i]);
+
+          if (str != NULL)
+          {
+              [array addObject: str];
+          }
       }
   }
 
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 03cb77e319f7..4690fe2886a6 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -92,6 +92,11 @@ public:
   */
   NSString* openOfficeToSystemFlavor(const com::sun::star::datatransfer::DataFlavor& oooDataFlavor) const;
 
+  /* Select the best available image data type
+     If there is no suiteable mapping available NULL will
+     be returned.
+  */
+  NSString* openOfficeImageToSystemFlavor(NSPasteboard* pPasteboard) const;
 
   /* Get a data provider which is able to provide the data 'rTransferable' offers in a format that can
      be put on to the system clipboard.
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index a893f09d89cc..e38e1e741cf7 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -91,7 +91,10 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor )
                                        static_cast<XTransferable*>(this));
     }
 
-  NSString* sysFormat = (NSString*)mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
+  NSString* sysFormat =
+      (aFlavor.MimeType.compareToAscii( "image/bmp", 9 ) == 0)
+      ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
+      : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
   DataProviderPtr_t dp;
 
   if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == NSOrderedSame)
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 0643efae33ca..15f99cbef8eb 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -1,22 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: OSXTransferable.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
 #include "PictToBmpFlt.hxx"
 
 /* This is a work-around to prevent 'deprecated' warning for 'KillPicture' API
    Hopefully we can get rid of this whole code again when the OOo PICT filter
    are good enough to be used see #i78953 thus this hack would vanish to again.
  */
+#include <premac.h>
 #include <AvailabilityMacros.h>
 #undef DEPRECATED_ATTRIBUTE
 #define DEPRECATED_ATTRIBUTE
 
-#include <premac.h>
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
 #include <postmac.h>
 
-
 bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
                com::sun::star::uno::Sequence<sal_Int8>& aBmp)
 {
+
   bool result = false;
 
   ComponentInstance bmpExporter;
@@ -112,3 +142,60 @@ bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
 
   return result;
 }
+
+bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
+                 com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+                 NSBitmapImageFileType eInFormat)
+{
+    if( eInFormat == PICTImageFileType )
+        return PICTtoBMP( aPict, aBmp );
+
+    bool bResult = false;
+
+    NSData* pData = [NSData dataWithBytesNoCopy: (void*)aPict.getConstArray() length: aPict.getLength() freeWhenDone: 0];
+    if( pData )
+    {
+        NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
+        if( pRep )
+        {
+            NSData* pOut = [pRep representationUsingType: NSBMPFileType properties: nil];
+            if( pOut )
+            {
+                aBmp.realloc( [pOut length] );
+                [pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
+                bResult = (aBmp.getLength() != 0);
+            }
+        }
+    }
+
+    return bResult;
+}
+
+bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+                 com::sun::star::uno::Sequence<sal_Int8>& aPict,
+                 NSBitmapImageFileType eOutFormat
+                )
+{
+    if( eOutFormat == PICTImageFileType )
+        return BMPtoPICT( aBmp, aPict );
+
+    bool bResult = false;
+
+    NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8*>(aBmp.getConstArray()) length: aBmp.getLength() freeWhenDone: 0];
+    if( pData )
+    {
+        NSBitmapImageRep* pRep = [NSBitmapImageRep imageRepWithData: pData];
+        if( pRep )
+        {
+            NSData* pOut = [pRep representationUsingType: eOutFormat properties: nil];
+            if( pOut )
+            {
+                aPict.realloc( [pOut length] );
+                [pOut getBytes: aPict.getArray() length: aPict.getLength()];
+                bResult = (aPict.getLength() != 0);
+            }
+        }
+    }
+
+    return bResult;
+}
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
index 29e9c535546f..12a73452ad7b 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
@@ -3,6 +3,10 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
+#include <premac.h>
+#include <Cocoa/Cocoa.h>
+#include <postmac.h>
+
 /* Transform PICT into the a Window BMP.
 
    Returns true if the conversion was successful false
@@ -19,4 +23,15 @@ bool PICTtoBMP(com::sun::star::uno::Sequence<sal_Int8>& aPict,
 bool BMPtoPICT(com::sun::star::uno::Sequence<sal_Int8>& aBmp,
                com::sun::star::uno::Sequence<sal_Int8>& aPict);
 
+#define PICTImageFileType ((NSBitmapImageFileType)~0)
+
+bool ImageToBMP( com::sun::star::uno::Sequence<sal_Int8>& aPict,
+                 com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+                 NSBitmapImageFileType eInFormat);
+
+bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp,
+                 com::sun::star::uno::Sequence<sal_Int8>& aPict,
+                 NSBitmapImageFileType eOutFormat
+                );
+
 #endif