From 134028c6160de7d2c05f0ff67d71cbdb4bff4737 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Mon, 16 Jul 2012 09:28:37 +0900
Subject: [PATCH] fdo#50269: bitmap area fill pattern reversed in LO3.5.x

this partially reverted 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d
in order to retain a hack for non-black background color

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
---
 filter/source/msfilter/msdffimp.cxx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index cd44fd9e7074..c3c413919c4d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1723,8 +1723,17 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
                             aXOBitmap.Bitmap2Array();
                             aXOBitmap.SetBitmapType( XBITMAP_8X8 );
                             aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
-                           aXOBitmap.SetPixelColor( aCol1 );
-                           aXOBitmap.SetBackgroundColor( aCol2 );
+
+                            if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
+                            {
+                                aXOBitmap.SetPixelColor( aCol1 );
+                                aXOBitmap.SetBackgroundColor( aCol2 );
+                            }
+                            else
+                            {
+                                aXOBitmap.SetPixelColor( aCol2 );
+                                aXOBitmap.SetBackgroundColor( aCol1 );
+                            }
                            aXOBitmap.Array2Bitmap();
                         }
                         rSet.Put( XFillBitmapItem( rtl::OUString(), aXOBitmap ) );