svn commit: r1532285 - /openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx

[alg]

Author: alg
Date: Tue Oct 15 10:54:43 2013
New Revision: 1532285

URL: http://svn.apache.org/r1532285
Log:
i123407 Do not insist on CF_DIBV5 for clipboard data, also accept CF_DIB

Modified:
    openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx

Modified: openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx?rev=1532285&r1=1532284&r2=1532285&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx 
(original)
+++ openoffice/trunk/main/dtrans/source/win32/dtobj/DOTransferable.cxx Tue Oct 
15 10:54:43 2013
@@ -136,6 +136,21 @@ Any SAL_CALL CDOTransferable::getTransfe
                         Any aAny = makeAny( aUnicodeText );
                         return aAny;
                }
+        else if(CF_DIBV5 == fetc.getClipformat())
+        {
+            // #123407# 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
        }