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 /sw/source/ui/dochdl/swdtflvr.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 'sw/source/ui/dochdl/swdtflvr.cxx')
| -rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 5bd3dd78c940..466aca42fc58 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -1330,6 +1330,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SOT_FORMATSTR_ID_SVXB: case SOT_FORMAT_BITMAP: + case SOT_FORMATSTR_ID_PNG: case SOT_FORMAT_GDIMETAFILE: nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, SW_PASTESDR_INSERT,pPt, @@ -1462,6 +1463,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData, case SOT_FORMATSTR_ID_SVXB: case SOT_FORMAT_GDIMETAFILE: case SOT_FORMAT_BITMAP: + case SOT_FORMATSTR_ID_PNG: case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK: case SOT_FORMAT_FILE: case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR: @@ -2221,6 +2223,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, switch( nFmt ) { case SOT_FORMAT_BITMAP: + case SOT_FORMATSTR_ID_PNG: case SOT_FORMAT_GDIMETAFILE: nRet = rData.GetGraphic( nFmt, aGraphic ); break; |