[Libreoffice-commits] core.git: vcl/source

[Andras Timar]

 vcl/source/filter/wmf/winmtf.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 0c58017468abb0ebee3088336e7e7a074e53edee
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon May 4 20:03:27 2015 +0200

    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 at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 740ac49..9b06893 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++;
+                            }
                         }
                     }
                 }