summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authormatteocam <matteo.campanelli@gmail.com>2014-05-31 02:14:50 -0400
committerFridrich Štrba <fridrich.strba@bluewin.ch>2014-06-30 22:54:40 +0200
commitf9e020227afc498a32e24eb731a26587036d53bc (patch)
treec85ce5937ddbcd954440c9a55a3c3a9815fc0353 /editeng
parentc7d80ccb4c915f7f0b3c9ddf88ef807504561f6c (diff)
Added case in editdoc.cxx
Change-Id: I572d79dfd770eaa13d24b27f1c689a059cb79153 (cherry picked from commit 073be3ab511a33e639135703caa2229c1f105b54)
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editattr.cxx11
-rw-r--r--editeng/source/editeng/editdoc.cxx5
2 files changed, 11 insertions, 5 deletions
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 4425871407ec..2d2a167fc9ff 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -131,13 +131,14 @@ void EditCharAttribUnderline::SetFont( SvxFont& rFont, OutputDevice* pOutDev )
Color aColor = RGB_COLORDATA(0x66,0x66, 0xFF); // blue-ish
rFont.SetUnderline( (FontUnderline)((const SvxUnderlineItem*)GetItem())->GetValue() );
- if ( pOutDev ) // FIXME(matteocam)
- pOutDev->SetTextLineColor( aColor );
- //pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
- // FIXME(matteocam)
+ /* FIXME(matteocam) */
+ rFont.SetFillColor(aColor);
+ // end FIXME
+
if ( pOutDev )
- pOutDev->SetTextFillColor(aColor);
+ pOutDev->SetTextLineColor( ((const SvxUnderlineItem*)GetItem())->GetColor() );
+
}
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 8c48fe98da45..6b63440cdc5e 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -404,6 +404,11 @@ EditCharAttrib* MakeCharAttrib( SfxItemPool& rPool, const SfxPoolItem& rAttr, sa
pNew = new EditCharAttribField( (const SvxFieldItem&)rNew, nS );
}
break;
+ case EE_CHAR_BKGCOLOR:
+ {
+ pNew = new EditCharAttribBackgroundColor( (const SvxBackgroundColorItem&)rNew, nS, nE );
+ }
+ break;
default:
{
OSL_FAIL( "Invalid Attribute!" );