[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source include/editeng

[matteocam]

 editeng/source/editeng/editattr.cxx |   11 ++++++-----
 editeng/source/editeng/editdoc.cxx  |    5 +++++
 include/editeng/eeitem.hxx          |    3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 073be3ab511a33e639135703caa2229c1f105b54
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Sat May 31 02:14:50 2014 -0400

    Added case in editdoc.cxx
    
    Change-Id: I572d79dfd770eaa13d24b27f1c689a059cb79153

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index f948771..2eba576 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 61b4a36..8750f2d 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 84a7296..1939395 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)