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

[matteocam]

 editeng/source/editeng/editattr.cxx |    6 +-----
 editeng/source/editeng/eerdll.cxx   |   11 ++++++-----
 include/editeng/eeitem.hxx          |   23 ++++++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit 8fd668c43982f683dca945277a6c9d4bc8ea720a
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Sat May 31 01:11:12 2014 -0400

    Added body of EditCharAttribBackgroundColor
    
    Change-Id: Ieac410809b33b1b489cb7563f3fed133d32832d0

diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index e04c8fd..f948771 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -237,17 +237,13 @@ EditCharAttribBackgroundColor::EditCharAttribBackgroundColor(
                                   sal_uInt16 _nEnd )
     : EditCharAttrib( rAttr, _nStart, _nEnd )
 {
-    // FIXME(matteocam)
-    //DBG_ASSERT( rAttr.Which() == EE_CHAR_BKG_COLOR, "Not a BackgroundColor attribute!" );
+    DBG_ASSERT( rAttr.Which() == EE_CHAR_BKGCOLOR, "Not a BackgroundColor attribute!" );
 }
 
 void EditCharAttribBackgroundColor::SetFont( SvxFont& rFont, OutputDevice* )
 {
-    /* FIXME(matteocam)
-     *
     Color aColor = ((const SvxBackgroundColorItem*)GetItem())->GetValue();
     rFont.SetFillColor( aColor); // XXX: Is it SetFillColor we want?
-    */
 
 }
 
commit c2580813426a58cd2ab22efacec9d28423201562
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Sat May 31 01:09:50 2014 -0400

    Added EE_CHAR_BKGCOLOR
    
    Change-Id: If11271f4b3b8f9ab67961206856938046ea2a416

diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 95c0bc6..ba0821d 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -156,13 +156,14 @@ SfxPoolItem** GlobalEditData::GetDefItems()
         ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE, EE_CHAR_OVERLINE );
         ppDefItems[48] = new SvxCaseMapItem( SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP );
         ppDefItems[49] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
+        ppDefItems[50] = new SvxBackgroundColorItem( Color( COL_AUTO ), EE_CHAR_BKGCOLOR );
         // Features
-        ppDefItems[50] = new SfxVoidItem( EE_FEATURE_TAB );
-        ppDefItems[51] = new SfxVoidItem( EE_FEATURE_LINEBR );
-        ppDefItems[52] = new SvxCharSetColorItem( Color( COL_RED ), RTL_TEXTENCODING_DONTKNOW, EE_FEATURE_NOTCONV );
-        ppDefItems[53] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
+        ppDefItems[51] = new SfxVoidItem( EE_FEATURE_TAB );
+        ppDefItems[52] = new SfxVoidItem( EE_FEATURE_LINEBR );
+        ppDefItems[53] = new SvxCharSetColorItem( Color( COL_RED ), RTL_TEXTENCODING_DONTKNOW, EE_FEATURE_NOTCONV );
+        ppDefItems[54] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
 
-        DBG_ASSERT( EDITITEMCOUNT == 54, "ITEMCOUNT geaendert, DefItems nicht angepasst!" );
+        DBG_ASSERT( EDITITEMCOUNT == 55, "ITEMCOUNT geaendert, DefItems nicht angepasst!" );
 
         // Init DefFonts:
         GetDefaultFonts( *(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO - EE_ITEMS_START],
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index b42b326..84a7296 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -22,6 +22,11 @@
 
 #include <svl/solar.hrc>
 
+/*
+ * NOTE: Changes in this file will probably require
+ *        consistent changes in eerdll.cxx as well.
+*/
+
 #define EE_ITEMS_START              (OWN_ATTR_VALUE_END+1)
 
 // Paragraph attributes:
@@ -80,18 +85,18 @@
 #define EE_CHAR_OVERLINE            (EE_ITEMS_START+47)
 #define EE_CHAR_CASEMAP             (EE_ITEMS_START+48)
 #define EE_CHAR_GRABBAG             (EE_ITEMS_START+49)
-//#define EE_CHAR_BKGCOLOR            (EE_ITEMS_START+50)
+#define EE_CHAR_BKGCOLOR            (EE_ITEMS_START+50)
 
-#define EE_CHAR_END                 (EE_ITEMS_START+49)
+#define EE_CHAR_END                 (EE_ITEMS_START+50)
 
-#define EE_FEATURE_START            (EE_ITEMS_START+50)
-#define EE_FEATURE_TAB              (EE_ITEMS_START+50)
-#define EE_FEATURE_LINEBR           (EE_ITEMS_START+51)
-#define EE_FEATURE_NOTCONV          (EE_ITEMS_START+52)
-#define EE_FEATURE_FIELD            (EE_ITEMS_START+53)
-#define EE_FEATURE_END              (EE_ITEMS_START+53)
+#define EE_FEATURE_START            (EE_ITEMS_START+51)
+#define EE_FEATURE_TAB              (EE_ITEMS_START+51)
+#define EE_FEATURE_LINEBR           (EE_ITEMS_START+52)
+#define EE_FEATURE_NOTCONV          (EE_ITEMS_START+53)
+#define EE_FEATURE_FIELD            (EE_ITEMS_START+54)
+#define EE_FEATURE_END              (EE_ITEMS_START+54)
 
-#define EE_ITEMS_END                (EE_ITEMS_START+53)
+#define EE_ITEMS_END                (EE_ITEMS_START+54)
 
 #define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 )