From f68601f8947b57e0158fb013fbe4b2e40bfa4ce5 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 23 Nov 2004 21:31:03 +0000
Subject: [PATCH] Bug #256455 --> Unable to copy from MS Word and paste into
 message compose body with formatting because we were incorrectly registering
 ourselves to handle native clipboard image formats for non Windows platforms.

sr=bienvenu


git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@165667 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
index a344ed6abe8..ca4e0429444 100644
--- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp
@@ -1148,8 +1148,11 @@ NS_IMETHODIMP nsHTMLEditor::PrepareHTMLTransferable(nsITransferable **aTransfera
       }
       (*aTransferable)->AddDataFlavor(kHTMLMime);
       (*aTransferable)->AddDataFlavor(kFileMime);
+#ifdef XP_WIN32
+      // we only support copy and paste of clipboard images on Windows
       (*aTransferable)->AddDataFlavor(kJPEGImageMime);
       (*aTransferable)->AddDataFlavor(kNativeImageMime);
+#endif
 
     }
     (*aTransferable)->AddDataFlavor(kUnicodeMime);