From 4bfa845b3ac524c29b84e751ca0e6bae352b45f4 Mon Sep 17 00:00:00 2001 From: matteocam Date: Mon, 16 Jun 2014 20:02:50 +0200 Subject: Associated CharBackColor to EE_CHAR_BKGCOLOR Change-Id: I3ce7b235aed71a51ccfa154227be16b3b2265d2a (cherry picked from commit 48647d731c3f85ce2ed9b3f89d73f805976118f5) --- include/editeng/unotext.hxx | 1 + svx/source/unodraw/unoprov.cxx | 1 + svx/source/unodraw/unoshap2.cxx | 1 + 3 files changed, 3 insertions(+) diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index f7ac059a6038..496de99c13f0 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -90,6 +90,7 @@ class SvxItemPropertySet; { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), EE_CHAR_WEIGHT, ::getCppuType((const float*)0), 0, MID_WEIGHT }, \ { OUString(UNO_NAME_EDIT_CHAR_LOCALE), EE_CHAR_LANGUAGE, ::cppu::UnoType::get(),0, MID_LANG_LOCALE }, \ { OUString(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR, ::cppu::UnoType::get(), 0, 0 }, \ + { OUString("CharBackColor"), EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(), 0, 0 }, \ { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT, ::cppu::UnoType::get(), 0, MID_ESC }, \ { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE, ::cppu::UnoType::get(), 0, MID_TL_STYLE }, \ { OUString("CharUnderlineColor"), EE_CHAR_UNDERLINE, ::cppu::UnoType::get(), 0, MID_TL_COLOR }, \ diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index b3bdd2c176a3..67467f832f4b 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -589,6 +589,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, cppu::UnoType::get(), 0, 0 }, + { OUString("CharBackColor"), 0, cppu::UnoType::get(), 0, 0 }, { OUString("CharRelief"), 0, cppu::UnoType::get(), 0, 0 }, { OUString("CharUnderlineColor"), 0, cppu::UnoType::get(), 0, 0 }, { OUString("CharKerning"), 0, cppu::UnoType::get(), 0, 0 }, diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 0c52dd972ad7..118a71557049 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -680,6 +680,7 @@ SvxShapeControlPropertyMapping[] = { RTL_CONSTASCII_STRINGPARAM("CharKerning"), RTL_CONSTASCII_STRINGPARAM("FontKerning") }, { RTL_CONSTASCII_STRINGPARAM("CharWordMode"), RTL_CONSTASCII_STRINGPARAM("FontWordLineMode" ) }, { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR), RTL_CONSTASCII_STRINGPARAM("TextColor") }, + // { RTL_CONSTASCII_STRINGPARAM("CharBackColor") }, { RTL_CONSTASCII_STRINGPARAM("CharRelief"), RTL_CONSTASCII_STRINGPARAM("FontRelief") }, { RTL_CONSTASCII_STRINGPARAM("CharUnderlineColor"), RTL_CONSTASCII_STRINGPARAM("TextLineColor") }, { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST), RTL_CONSTASCII_STRINGPARAM("Align") }, -- cgit