summaryrefslogtreecommitdiff
path: root/svx/source/gallery2
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2024-04-09 15:28:00 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2024-11-19 01:14:11 +0100
commitc4aa95310d98a7f92ae799ead76c8b25ffca53b3 (patch)
tree5dd890dfdeff998993bc6e5c1a46aa5acbf42d13 /svx/source/gallery2
parent0313b56b931d78453ac5711d5f5f16eed38d02ca (diff)
tdf#160267 Fix SVG and add PNG format from the clipboard
Since 6c04b8356c0764ba8ac51448eee5ff577b08d9e2 SVG was added to the supported clipboard formats but it did not work. SVG support is now fixed and PNG format is added in the gallery. Change-Id: Ic9cb2eebfc37bd38605dfaa3a1c353a7532af357 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165908 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r--svx/source/gallery2/galmisc.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 6e80276c3aa6..cda1c9af2c71 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -489,7 +489,8 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons
{
bRet = SetGDIMetaFile( mpGraphicObject->GetGraphic().GetGDIMetaFile() );
}
- else if( ( SotClipboardFormatId::BITMAP == nFormat ) && mpGraphicObject )
+ else if( ( SotClipboardFormatId::BITMAP == nFormat || SotClipboardFormatId::PNG == nFormat)
+ && mpGraphicObject )
{
bRet = SetBitmapEx( mpGraphicObject->GetGraphic().GetBitmapEx(), rFlavor );
}