filter/source/msfilter/msdffimp.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
New commits: commit 134028c6160de7d2c05f0ff67d71cbdb4bff4737 Author: Takeshi Abe <[email protected]> Date: Mon Jul 16 09:28:37 2012 +0900 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 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index cd44fd9..c3c4139 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 ) ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
