summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-01-29 16:10:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-30 09:21:30 +0000
commit90d39a8a22c3f75e7eb4a79062e1d94c1fa1ff85 (patch)
tree60231554ed1c8f7807847318a3e7fcf9612da46d /sd
parent36c5078d244e5a757d92cdc0f183ebd11712f6fc (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 'sd')
-rw-r--r--sd/source/ui/app/sdxfer.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index e9664f3839e7..addf6615da74 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -403,12 +403,14 @@ void SdTransferable::AddSupportedFormats()
if( mpGraphic->GetType() == GRAPHIC_BITMAP )
{
+ AddFormat( SOT_FORMATSTR_ID_PNG );
AddFormat( SOT_FORMAT_BITMAP );
AddFormat( SOT_FORMAT_GDIMETAFILE );
}
else
{
AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SOT_FORMATSTR_ID_PNG );
AddFormat( SOT_FORMAT_BITMAP );
}
}
@@ -424,6 +426,7 @@ void SdTransferable::AddSupportedFormats()
if( !mpSdDrawDocument || !lcl_HasOnlyControls( mpSdDrawDocument ) )
{
AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SOT_FORMATSTR_ID_PNG );
AddFormat( SOT_FORMAT_BITMAP );
}