diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-06-09 11:53:12 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:22:26 +0200 |
| commit | f0e183707dd4edf3d4cc41f5e857044244973607 (patch) | |
| tree | adf3fe21a3ad7722528b5050d4aa54377d8cca32 /svx | |
| parent | 30595fdd008228c4dbf64b46a59d59d53a1f2b21 (diff) | |
tdf#88295: Don't export transparent background colour as white
The fix is twofold:
1. retrieve transparency from colour in SvxBackgroundColorItem
(add QueryValue, PutValue methods, use additional memberID to
retrieve alpha channel as a bool property)
2. add CharBackTransparent bool property to Draw [text] shapes
Change-Id: I6e14b81cc82f6b4d7fdd4756ff2e4f75e9270361
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 1 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 2d092a0253ab..80bf3e7c8e50 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -588,6 +588,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { 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("CharBackTransparent"), 0, cppu::UnoType<bool>::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 ccd5515e69d9..f01fe9e6c5e0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -669,6 +669,7 @@ SvxShapeControlPropertyMapping[] = { 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("CharBackColor") }, + { RTL_CONSTASCII_STRINGPARAM("CharBackTransparent"), RTL_CONSTASCII_STRINGPARAM("CharBackTransparent") }, { 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") }, |