summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-01-29 16:10:39 +0000
committerTor Lillqvist <tml@collabora.com>2014-04-02 14:32:00 +0300
commit3ae6b906c50d2f1b955d877d2aec07f1c6ec0fc9 (patch)
tree6d5adb3787ff25adffb77368ab71a13478bb8e75 /sd
parent10487efd41e42933bb88f75a3f9f97d1c6ccbb4e (diff)
Resolves: #i124085# disabled CF_DIBV5...
(no advantages but some problems), increased png support (cherry picked from commit c991f7cae8dcb306cb0d1f32bc5fcd8ea0a1ea81) Change-Id: I52bef1295b32eb3692a0428c96edd0c55287f34a Reviewed-on: https://gerrit.libreoffice.org/8784 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
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 24d850c0aa11..d618df4229f0 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 );
}