Kaydet (Commit) 20658ca9 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

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

also accept CF_DIB

(cherry picked from commit b7d59ee3)

Change-Id: Iaafdeab981d6621e6696a642c68e29392af3e200
üst 1cb01c47
......@@ -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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment