From 321f4925a79b74cfd0aea2221a74dd2717e6b8b2 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Tue, 9 Jun 2015 11:53:12 +0200 Subject: tdf#88055: 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 Change-Id: Id830bd18fd6da5d9a46e2a94aa254d5d2a6b7ebb Reviewed-on: https://gerrit.libreoffice.org/16182 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- include/editeng/colritem.hxx | 2 ++ include/editeng/unotext.hxx | 1 + 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 64d8a56669c8..dadd4959f7a6 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -83,6 +83,8 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; + virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId = 0) SAL_OVERRIDE; }; #endif diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index f3d239604568..2bc45c24e28e 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -91,6 +91,7 @@ class SvxItemPropertySet; { 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("CharBackTransparent"), EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \ { 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 }, \ -- cgit