incubator-ooo-commits mailing list archives

Author: erack
Date: Sat Sep 10 22:44:11 2011
New Revision: 1167623

URL: http://svn.apache.org/viewvc?rev=1167623&view=rev
Log:
impress212: #i71731# fixed fill bitmap - pattern import

# User sj <sj@openoffice.org>

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1167623&r1=1167622&r2=1167623&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Sat Sep 10 22:44:11 2011
@@ -1923,8 +1923,6 @@ void DffPropertyReader::ApplyFillAttribu
 							aCol2 = rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_fillBackColor ), DFF_Prop_fillBackColor
);
 
 						XOBitmap aXOBitmap;
-
-						// Bitmap einsetzen
 						aXOBitmap.SetBitmap( aBmp );
 						aXOBitmap.SetBitmapType( XBITMAP_IMPORT );
 
@@ -1933,17 +1931,9 @@ void DffPropertyReader::ApplyFillAttribu
 							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 ) );
 					}