diff options
| author | Armin Le Grand <alg@apache.org> | 2014-01-29 16:10:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-30 09:21:30 +0000 |
| commit | 90d39a8a22c3f75e7eb4a79062e1d94c1fa1ff85 (patch) | |
| tree | 60231554ed1c8f7807847318a3e7fcf9612da46d /dtrans/source/win32/dtobj/DOTransferable.cxx | |
| parent | 36c5078d244e5a757d92cdc0f183ebd11712f6fc (diff) | |
Resolves: #i124085# disabled CF_DIBV5...
(no advantages but some problems), increased png support
(cherry picked from commit c991f7cae8dcb306cb0d1f32bc5fcd8ea0a1ea81)
Change-Id: I52bef1295b32eb3692a0428c96edd0c55287f34a
Diffstat (limited to 'dtrans/source/win32/dtobj/DOTransferable.cxx')
| -rw-r--r-- | dtrans/source/win32/dtobj/DOTransferable.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 83a8461f415a..ff1e8bb1fceb 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -116,6 +116,8 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor ) Any aAny = makeAny( aUnicodeText ); return aAny; } + // #i124085# CF_DIBV5 should not be possible, but keep for reading from the + // clipboard for being on the safe side else if(CF_DIBV5 == fetc.getClipformat()) { // #i123407# CF_DIBV5 has priority; if the try to fetch this failed, @@ -353,6 +355,7 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor clipDataToByteStream( aFormatEtc.getClipformat( ), stgmedium, byteStream ); // format conversion if necessary + // #i124085# DIBV5 should not happen currently, but keep as a hint here if(CF_DIBV5 == aFormatEtc.getClipformat() || CF_DIB == aFormatEtc.getClipformat()) { byteStream = WinDIBToOOBMP(byteStream); |