diff options
| author | Armin Le Grand <alg@apache.org> | 2014-01-29 16:10:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-31 15:26:41 +0000 |
| commit | 1711bf49b0a426908c74b98e215c0ef8f3d2e601 (patch) | |
| tree | c4399f76d4a0d565ae2b29209dec604476b0979c /sc/source/ui/app/drwtrans.cxx | |
| parent | 6a227525d8994be2ccc07e8bda2b51d8827d241c (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 'sc/source/ui/app/drwtrans.cxx')
| -rw-r--r-- | sc/source/ui/app/drwtrans.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index c1da078cf804..63a81c04ef13 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -308,6 +308,7 @@ void ScDrawTransferObj::AddSupportedFormats() { AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); AddFormat( SOT_FORMATSTR_ID_SVXB ); + AddFormat( SOT_FORMATSTR_ID_PNG ); AddFormat( SOT_FORMAT_BITMAP ); AddFormat( SOT_FORMAT_GDIMETAFILE ); } @@ -319,6 +320,7 @@ void ScDrawTransferObj::AddSupportedFormats() AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); AddFormat( SOT_FORMATSTR_ID_SVXB ); AddFormat( SOT_FORMAT_GDIMETAFILE ); + AddFormat( SOT_FORMATSTR_ID_PNG ); AddFormat( SOT_FORMAT_BITMAP ); } else if ( pBookmark ) // url button @@ -364,6 +366,7 @@ void ScDrawTransferObj::AddSupportedFormats() // leave out bitmap and metafile if there are only controls if ( !lcl_HasOnlyControls( pModel ) ) { + AddFormat( SOT_FORMATSTR_ID_PNG ); AddFormat( SOT_FORMAT_BITMAP ); AddFormat( SOT_FORMAT_GDIMETAFILE ); } @@ -416,7 +419,9 @@ sal_Bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataF { bOK = SetObject( pModel, SCDRAWTRANS_TYPE_DRAWMODEL, rFlavor ); } - else if ( nFormat == SOT_FORMAT_BITMAP || nFormat == SOT_FORMAT_GDIMETAFILE ) + else if ( nFormat == SOT_FORMAT_BITMAP + || nFormat == SOT_FORMATSTR_ID_PNG + || nFormat == SOT_FORMAT_GDIMETAFILE ) { // #i71538# use complete SdrViews // SdrExchangeView aView( pModel ); |