dtrans/source/win32/dtobj/DOTransferable.cxx | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit b7d59ee36d0786aba13e6b00d93cdfa0045e5379
Author: Armin Le Grand <a...@apache.org>
Date: Tue Oct 15 10:54:43 2013 +0000
i123407 Do not insist on CF_DIBV5 for clipboard data, also accept CF_DIB
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index fdbe784..e5d8db7 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -136,6 +136,21 @@ Any SAL_CALL CDOTransferable::getTransferData( const
DataFlavor& aFlavor )
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
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
