diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-06-17 15:28:06 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:43 +0200 |
| commit | c2d5c39b0c9559b772027a8182c5670c1b2dc7e0 (patch) | |
| tree | dc69885aab5cc1ea16a616b6f62e536e84ba40cc /editeng | |
| parent | 4bfa845b3ac524c29b84e751ca0e6bae352b45f4 (diff) | |
Removed assertion in EditCharAttribBackgroundColor
Change-Id: Ic9b41eed686ca8bf07c8e3e1555fc6953093a2d4
(cherry picked from commit e68c18f1afe93eba5e79829510df16a78d66c95e)
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editattr.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 55598e6ae8ea..978958c2cd26 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/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); } |