diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-31 02:14:50 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:40 +0200 |
| commit | f9e020227afc498a32e24eb731a26587036d53bc (patch) | |
| tree | c85ce5937ddbcd954440c9a55a3c3a9815fc0353 | |
| parent | c7d80ccb4c915f7f0b3c9ddf88ef807504561f6c (diff) | |
Added case in editdoc.cxx
Change-Id: I572d79dfd770eaa13d24b27f1c689a059cb79153
(cherry picked from commit 073be3ab511a33e639135703caa2229c1f105b54)
| -rw-r--r-- | editeng/source/editeng/editattr.cxx | 11 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 5 | ||||
| -rw-r--r-- | include/editeng/eeitem.hxx | 3 |
3 files changed, 13 insertions, 6 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!" ); diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx index 84a7296b9224..19393957e6bf 100644 --- a/include/editeng/eeitem.hxx +++ b/include/editeng/eeitem.hxx @@ -24,7 +24,8 @@ /* * NOTE: Changes in this file will probably require - * consistent changes in eerdll.cxx as well. + * consistent changes in eerdll.cxx and editdoc.cxx + * as well. */ #define EE_ITEMS_START (OWN_ATTR_VALUE_END+1) |