diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-05-04 20:03:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-05-05 07:26:12 +0000 |
| commit | 0c58017468abb0ebee3088336e7e7a074e53edee (patch) | |
| tree | d8303bf0eb7dd824f25932b90b0cf44e6d458874 | |
| parent | f62af191bf0f0d1578abc919ca3c902864fefa22 (diff) | |
tdf#90539 special case for EMF placeholder icon of OLE object
Change-Id: Id775680d6b2aec1fd84981a72a94fe4934bef003
Reviewed-on: https://gerrit.libreoffice.org/15632
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 740ac493f353..9b068935121b 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -1639,6 +1639,15 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) bDrawn = true; i++; } + // tdf#90539 + else if ( ( nWinRop == SRCAND ) && ( pSave2->nWinRop == SRCINVERT ) ) + { + Bitmap aMask( pSave->aBmp ); + BitmapEx aBmpEx( pSave2->aBmp, aMask ); + ImplDrawBitmap( aPos, aSize, aBmpEx ); + bDrawn = true; + i++; + } } } } |