From 6727e417404a6c6c5924465abc920a4527e6e1dd Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Tue, 9 Jun 2015 11:53:12 +0200 Subject: 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, xmloff needs it to be able to output 'transparent' string instead of '#XXYYZZ' colour code in ODF format Conflicts: include/editeng/colritem.hxx Change-Id: I6e14b81cc82f6b4d7fdd4756ff2e4f75e9270361 Reviewed-on: https://gerrit.libreoffice.org/16243 Reviewed-by: Muthu Subramanian K Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- svx/source/unodraw/unoprov.cxx | 1 + svx/source/unodraw/unoshap2.cxx | 1 + 2 files changed, 2 insertions(+) (limited to 'svx') diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 4bd415154f34..73661666c9cd 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::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, cppu::UnoType::get(), 0, 0 }, { OUString("CharBackColor"), 0, cppu::UnoType::get(), 0, 0 }, + { OUString("CharBackTransparent"), 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 3f8c7b7447e7..a4853c5fe924 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") }, -- cgit v1.2.3