diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-07-16 09:28:37 +0900 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-07-31 20:32:56 +0100 |
| commit | 134028c6160de7d2c05f0ff67d71cbdb4bff4737 (patch) | |
| tree | 7695dfcd2cb141868857cde3f865943318fd3861 /filter | |
| parent | 16ae7484b03149345751b7804cbc9ce3180565ec (diff) | |
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
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 13 |
1 files 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 ) ); |