Resolves: #i123407# Do not insist on CF_DIBV5 for clipboard data

also accept CF_DIB (cherry picked from commit b7d59ee36d0786aba13e6b00d93cdfa0045e5379) Change-Id: Iaafdeab981d6621e6696a642c68e29392af3e200
2013-10-15 13:27:31 +01:00
parent 1cb01c477c
commit 20658ca9f8
1 changed files with 15 additions and 0 deletions
@@ -116,6 +116,21 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
             Any aAny = makeAny( aUnicodeText );
             return aAny;
        }
+        else if(CF_DIBV5 == fetc.getClipformat())
+        {
+            // #i123407# CF_DIBV5 has priority; if the try to fetch this failed,
+            // check CF_DIB availability as an alternative
+            fetc.setClipformat(CF_DIB);
+
+            try
+            {
+                clipDataStream = getClipboardData( fetc );
+            }
+            catch( UnsupportedFlavorException& )
+            {
+                throw; // pass through, tried all possibilities
+            }
+        }
        else
            throw; // pass through exception
    }