mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I89d89cedb5e27e2a05b1ecc13569e4899d1743d2
This commit is contained in:
Takeshi Abe
2012-07-16 09:28:37 +09:00
committed by Noel Power
parent 16ae7484b0
commit 134028c616
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
filter/source/msfilter/msdffimp.cxx
View File

@@ -1723,8 +1723,17 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co
aXOBitmap.Bitmap2Array(); aXOBitmap.Bitmap2Array();
aXOBitmap.SetBitmapType( XBITMAP_8X8 ); aXOBitmap.SetBitmapType( XBITMAP_8X8 );
aXOBitmap.SetPixelSize( aBmp.GetSizePixel() ); aXOBitmap.SetPixelSize( aBmp.GetSizePixel() );
if( aXOBitmap.GetBackgroundColor() == COL_BLACK )
{
aXOBitmap.SetPixelColor( aCol1 ); aXOBitmap.SetPixelColor( aCol1 );
aXOBitmap.SetBackgroundColor( aCol2 ); aXOBitmap.SetBackgroundColor( aCol2 );
}
else
{
aXOBitmap.SetPixelColor( aCol2 );
aXOBitmap.SetBackgroundColor( aCol1 );
}
aXOBitmap.Array2Bitmap(); aXOBitmap.Array2Bitmap();
} }
rSet.Put( XFillBitmapItem( rtl::OUString(), aXOBitmap ) ); rSet.Put( XFillBitmapItem( rtl::OUString(), aXOBitmap ) );