fdo#50269: bitmap area fill pattern reversed in LO3.5.x

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

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2

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 ) );