diff options
| author | erack <er@openoffice.org> | 2011-09-10 22:44:11 +0000 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-23 23:34:56 +0100 |
| commit | 619ea0c6d3b8fb4390bf5e82f1b44608c3cd878d (patch) | |
| tree | a8fa5e1c94ff3452cf312803324858c48f2a8aa9 /filter | |
| parent | 246c64c6a4375ab22dc8baa70093d373bea64ff2 (diff) | |
impress212: #i71731# fixed fill bitmap - pattern import
# User sj <sj@openoffice.org>
* found as LGPLv3-only fix at svn rev 1167623 (http://svn.apache.org/viewvc?view=revision&revision=1167623)
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c26f214251b0..47077dbc3c6b 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1737,8 +1737,6 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co aCol2 = rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillBackColor ), DFF_Prop_fillBackColor ); XOBitmap aXOBitmap; - - // Bitmap einsetzen aXOBitmap.SetBitmap( aBmp ); aXOBitmap.SetBitmapType( XBITMAP_IMPORT ); @@ -1747,17 +1745,9 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co aXOBitmap.Bitmap2Array(); aXOBitmap.SetBitmapType( XBITMAP_8X8 ); aXOBitmap.SetPixelSize( aBmp.GetSizePixel() ); - - if( aXOBitmap.GetBackgroundColor() == COL_BLACK ) - { - aXOBitmap.SetPixelColor( aCol1 ); - aXOBitmap.SetBackgroundColor( aCol2 ); - } - else - { - aXOBitmap.SetPixelColor( aCol2 ); - aXOBitmap.SetBackgroundColor( aCol1 ); - } + aXOBitmap.SetPixelColor( aCol1 ); + aXOBitmap.SetBackgroundColor( aCol2 ); + aXOBitmap.Array2Bitmap(); } rSet.Put( XFillBitmapItem( String(), aXOBitmap ) ); } |