Removed assertion in EditCharAttribBackgroundColor

Change-Id: Ic9b41eed686ca8bf07c8e3e1555fc6953093a2d4
(cherry picked from commit e68c18f1)

editeng/source/editeng/editattr.cxx

@@ -133,8 +133,8 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
     rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() );
 
     /* FIXME(matteocam) */
-    rFont.SetFillColor(aColor); // XXX: alone it works but it set it white (vcl causing troubes?)
-    rFont.SetTransparent(false); // XXX: will this be enough?
+    rFont.SetFillColor(aColor);
+    rFont.SetTransparent(false);
     //if (pOutDev)
     //    pOutDev->SetTextFillColor(aColor); // this doesn't work either
     // end FIXME
@@ -241,15 +241,14 @@ EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
                                   sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
-    DBG_ASSERT( rAttr.Which() == EE_CHAR_BKGCOLOR, "Not a BackgroundColor attribute!" );
+    DBG_ASSERT( rAttr.Which() == EE_CHAR_BKGCOLOR, "Not a BackColor attribute!" );
 }
 
 void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* )
 {
-#define BREAK_BKG_COLOR_SET_FONT 0
-    assert(BREAK_BKG_COLOR_SET_FONT); // XXX: checking if this is being called // FIXME(matteocam)
     Color aColor = ((const SvxBackgroundColorItem*)GetItem())->GetValue();
-    rFont.SetFillColor( aColor); // XXX: Is it SetFillColor we want?
+    rFont.SetFillColor( aColor);
+    rFont.SetTransparent(false);
 
 }
 

svx/source/unodraw/unoshap2.cxx

@@ -680,7 +680,7 @@ SvxShapeControlPropertyMapping[] =
     { RTL_CONSTASCII_STRINGPARAM("CharKerning"), RTL_CONSTASCII_STRINGPARAM("FontKerning") },
     { RTL_CONSTASCII_STRINGPARAM("CharWordMode"), RTL_CONSTASCII_STRINGPARAM("FontWordLineMode" ) },
     { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR),   RTL_CONSTASCII_STRINGPARAM("TextColor") },
-   // { RTL_CONSTASCII_STRINGPARAM("CharBackColor") },
+   // { RTL_CONSTASCII_STRINGPARAM("CharBackColor") }, // FIXME(matteocam)
     { RTL_CONSTASCII_STRINGPARAM("CharRelief"),   RTL_CONSTASCII_STRINGPARAM("FontRelief") },
     { RTL_CONSTASCII_STRINGPARAM("CharUnderlineColor"),   RTL_CONSTASCII_STRINGPARAM("TextLineColor") },
     { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST), RTL_CONSTASCII_STRINGPARAM("Align") },