diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-01-22 11:39:41 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-01-29 12:02:11 +0000 |
| commit | 6f12c93703b676b1b3839caaf2c21788e5d68477 (patch) | |
| tree | b62b26ed86f6e656ca66d85e828abd2475f03bc0 /svtools | |
| parent | Use ResourceMenuController for toolbar-based menus too (diff) | |
| download | core-6f12c93703b676b1b3839caaf2c21788e5d68477.tar.gz core-6f12c93703b676b1b3839caaf2c21788e5d68477.zip | |
tdf#91017 Enhance WMF import of EMR_ALPHABLEND action
The EMR_ALPHABLEND action was added 2012/2013, but missed support for
Bitmaps with Mask/Alpha. Due to that files with WMF containing these
actions may look different from before. Added suport to load contained
Mask/Alpha information in DIBs and the needed additional processing
through the display chain. WMF import is still based on Metafile
creation, when it would be using Primitives more original data could be
preserved.
Change-Id: I577569848cee2528328181fa0c7eb7f87857d094
Reviewed-on: https://gerrit.libreoffice.org/21709
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index ccad405e1fce..2650d9c3f7b2 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1673,13 +1673,13 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r if(rBmpEx.IsEmpty()) { Bitmap aBitmap; - Bitmap aMask; + AlphaMask aMask; // explicitely use Bitmap::Read with bFileHeader = sal_True // #i124085# keep DIBV5 for read from clipboard, but should not happen ReadDIBV5(aBitmap, aMask, *xStm); - if(aMask.IsEmpty()) + if(aMask.GetBitmap().IsEmpty()) { rBmpEx = aBitmap; } |