include/editeng/unotext.hxx | 1 +
svx/source/unodraw/unoprov.cxx | 1 +
svx/source/unodraw/unoshap2.cxx | 1 +
3 files changed, 3 insertions(+)
New commits:
commit 48647d731c3f85ce2ed9b3f89d73f805976118f5
Author: matteocam <matteo.campane...@gmail.com>
Date: Mon Jun 16 20:02:50 2014 +0200
Associated CharBackColor to EE_CHAR_BKGCOLOR
Change-Id: I3ce7b235aed71a51ccfa154227be16b3b2265d2a
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 9000c9c..886b200 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<com::sun::star::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
{ OUString(UNO_NAME_EDIT_CHAR_COLOR), EE_CHAR_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0 }, \
+ { OUString("CharBackColor"), EE_CHAR_BKGCOLOR,
::cppu::UnoType<sal_Int32>::get(), 0, 0 }, \
{ OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT), EE_CHAR_ESCAPEMENT,
::cppu::UnoType<sal_Int16>::get(), 0, MID_ESC }, \
{ OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), EE_CHAR_UNDERLINE,
::cppu::UnoType<sal_Int16>::get(), 0, MID_TL_STYLE }, \
{ OUString("CharUnderlineColor"), EE_CHAR_UNDERLINE,
::cppu::UnoType<sal_Int32>::get(), 0, MID_TL_COLOR }, \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index b3bdd2c..67467f8 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<sal_Int16>::get(), 0, 0},
{ OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString(UNO_NAME_EDIT_CHAR_COLOR), 0,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("CharBackColor"), 0,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("CharRelief"), 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("CharUnderlineColor"), 0,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("CharKerning"), 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index cafb6b5..6f8cd89 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") },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
