diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-06 16:13:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-06 17:30:27 +0200 |
| commit | c1c67cca7de5714635bef88de943b6c2e519eddf (patch) | |
| tree | 8911bc01834a39bdba3b645955bbc2fd48249b7b /include/svx | |
| parent | 8fa958d7d7f454cbea83fdafdde295ffd960787e (diff) | |
tdf#101181: support for transparency attribute of glow effect
Read/write support for ODF and OOXML (in ODF, loext:glow-transparency
attribute of style:graphic-properties has been added).
Added UI on glow sidebar panel.
Not used in actual painting yet.
Change-Id: I21b25d9c52c8611cd796f056374377ebf13cc2f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93565
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/strings.hrc | 1 | ||||
| -rw-r--r-- | include/svx/svddef.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 1 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 7a1f97edbea9..472a35a487e8 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -515,6 +515,7 @@ #define SIP_SA_GLOW NC_("SIP_SA_GLOW", "Glow effect") #define SIP_SA_GLOW_RAD NC_("SIP_SA_GLOW_RAD", "Radius of glow effect") #define SIP_SA_GLOW_COLOR NC_("SIP_SA_GLOW_COLOR", "Color of glow effect") +#define SIP_SA_GLOW_TRANSPARENCY NC_("SIP_SA_GLOW_TRANSPARENCY", "Transparency of glow effect") #define STR_ObjNameSingulMEDIA NC_("STR_ObjNameSingulMEDIA", "Media object") #define STR_ObjNamePluralMEDIA NC_("STR_ObjNamePluralMEDIA", "Media objects") // drawing layer table strings diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index c00c1a007034..d6bbccf57654 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -419,7 +419,8 @@ constexpr sal_uInt16 SDRATTR_GLOW_FIRST (SDRATTR_TABLE_LAST+1); constexpr TypedWhichId<SdrOnOffItem> SDRATTR_GLOW (SDRATTR_GLOW_FIRST+0); constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RAD (SDRATTR_GLOW_FIRST+1); constexpr TypedWhichId<XColorItem> SDRATTR_GLOW_COLOR (SDRATTR_GLOW_FIRST+2); -constexpr sal_uInt16 SDRATTR_GLOW_LAST (SDRATTR_GLOW_COLOR); +constexpr TypedWhichId<SdrPercentItem> SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST + 3); +constexpr sal_uInt16 SDRATTR_GLOW_LAST (SDRATTR_GLOW_TRANSPARENCY); constexpr sal_uInt16 SDRATTR_END (SDRATTR_GLOW_LAST); /* 1357 */ /* 1333 V4+++*/ /* 1243 V4+++*/ /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 1065 */ diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 1aa3111beeba..61d02ff504ea 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -417,6 +417,7 @@ class SvxSetItem; #define SID_ATTR_GLOW ( SID_SVX_START + 320 ) #define SID_ATTR_GLOW_COLOR ( SID_SVX_START + 321 ) #define SID_ATTR_GLOW_RADIUS ( SID_SVX_START + 322 ) +#define SID_ATTR_GLOW_TRANSPARENCY ( SID_SVX_START + 323 ) #define SID_SCAN ( SID_SVX_START + 330 ) #define SID_TWAIN_SELECT ( SID_SVX_START + 331 ) #define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 ) diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 19eb4aeb867d..b8c0990fa2f7 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -212,7 +212,8 @@ #define GLOW_PROPERTIES \ { OUString("GlowEffect"), SDRATTR_GLOW, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString{"GlowEffectRad"}, SDRATTR_GLOW_RAD, ::cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ - { OUString{"GlowEffectColor"}, SDRATTR_GLOW_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, + { OUString{"GlowEffectColor"}, SDRATTR_GLOW_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \ + { OUString{"GlowEffectTransparency"}, SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, #define SHADOW_PROPERTIES \ { OUString(UNO_NAME_SHADOW), SDRATTR_SHADOW, cppu::UnoType<bool>::get(), 0, 0}, \ |