dtrans/source/win32/dtobj/DOTransferable.cxx | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
New commits: commit 20658ca9f8dd840a593de727e89b84e27bf90245 Author: Armin Le Grand <[email protected]> Date: Tue Oct 15 10:54:43 2013 +0000 Resolves: #i123407# Do not insist on CF_DIBV5 for clipboard data also accept CF_DIB (cherry picked from commit b7d59ee36d0786aba13e6b00d93cdfa0045e5379) Change-Id: Iaafdeab981d6621e6696a642c68e29392af3e200 diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 7e35ac2..83a8461 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -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 } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
