From 0c58017468abb0ebee3088336e7e7a074e53edee Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Mon, 4 May 2015 20:03:27 +0200
Subject: 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>
---
 vcl/source/filter/wmf/winmtf.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

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++;
+                            }
                         }
                     }
                 }
-- 
cgit