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-02-05 08:53:58 +0000 |
| commit | bc257df73af5fdaf973c8229a743a3ea0ce06a67 (patch) | |
| tree | ff0b2ca3d7aa3879bd9edfd66fad666ae61c88db /svtools/source | |
| parent | 17336c2aec3946144026dac509917acb6846e1c8 (diff) | |
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.
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>
(cherry picked from commit 6f12c93703b676b1b3839caaf2c21788e5d68477)
Change-Id: I577569848cee2528328181fa0c7eb7f87857d094
Reviewed-on: https://gerrit.libreoffice.org/22053
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'svtools/source')
| -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 f9f84be461ac..0bca9eef5f72 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1656,13 +1656,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; } |