diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-31 01:09:50 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:39 +0200 |
| commit | 139ca8f26419d4b3e4f478ef8ff7536176c54f1c (patch) | |
| tree | 95cf6b8da4f2db8347f1b244b3ca12cd2a33cf3e | |
| parent | 4693d7cc99fa4b659f834e703b8bbb0424d55fee (diff) | |
Added EE_CHAR_BKGCOLOR
Change-Id: If11271f4b3b8f9ab67961206856938046ea2a416
(cherry picked from commit c2580813426a58cd2ab22efacec9d28423201562)
| -rw-r--r-- | editeng/source/editeng/eerdll.cxx | 11 | ||||
| -rw-r--r-- | include/editeng/eeitem.hxx | 23 |
2 files changed, 20 insertions, 14 deletions
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 95c0bc65e88e..ba0821d72e29 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 b42b326b0b1e..84a7296b9224 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 ) |