diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-11 17:26:22 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-11 18:24:23 +0200 |
| commit | d8d31f74236e87ea878f7fac5538e707df5b13ca (patch) | |
| tree | 539caa213012a0c2b3f22d528eeeb4c64803e2e0 /include | |
| parent | 14514042f7c908d08c3284135cc6de8da387c118 (diff) | |
tdf#49247: no need in extra boolean property, radius is enough
When soft edge has radius 0, the effect is disabled.
Change-Id: I7d66ea7b87e0ed59129a83885d52906b8edf75f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93971
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/strings.hrc | 1 | ||||
| -rw-r--r-- | include/svx/svddef.hxx | 3 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 3 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 1 | ||||
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 |
5 files changed, 2 insertions, 7 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index e6ff4f7cc25b..5fbb88d75df3 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -516,7 +516,6 @@ #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 SIP_SA_SOFTEDGE NC_("SIP_SA_SOFTEDGE", "Soft edge effect") #define SIP_SA_SOFTEDGE_RAD NC_("SIP_SA_SOFTEDGE_RAD", "Radius of soft edge effect") #define STR_ObjNameSingulMEDIA NC_("STR_ObjNameSingulMEDIA", "Media object") #define STR_ObjNamePluralMEDIA NC_("STR_ObjNamePluralMEDIA", "Media objects") diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx index 2b8fb1e74fbb..3b9be15d315f 100644 --- a/include/svx/svddef.hxx +++ b/include/svx/svddef.hxx @@ -423,8 +423,7 @@ constexpr TypedWhichId<SdrPercentItem> SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FI constexpr sal_uInt16 SDRATTR_GLOW_LAST (SDRATTR_GLOW_TRANSPARENCY); constexpr sal_uInt16 SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST + 1); -constexpr TypedWhichId<SdrOnOffItem> SDRATTR_SOFTEDGE(SDRATTR_SOFTEDGE_FIRST + 0); -constexpr TypedWhichId<SdrMetricItem> SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 1); +constexpr TypedWhichId<SdrMetricItem> SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 0); constexpr sal_uInt16 SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RAD); constexpr sal_uInt16 SDRATTR_END (SDRATTR_SOFTEDGE_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 ab6fce14082c..449258d430d6 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -418,8 +418,7 @@ class SvxSetItem; #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_ATTR_SOFTEDGE ( SID_SVX_START + 324 ) -#define SID_ATTR_SOFTEDGE_RADIUS ( SID_SVX_START + 325 ) +#define SID_ATTR_SOFTEDGE_RADIUS ( SID_SVX_START + 324 ) #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 12188840cfe4..fbc6b1c387b1 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -216,7 +216,6 @@ { OUString{"GlowEffectTransparency"}, SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType<sal_Int16>::get(), 0, 0 }, #define SOFTEDGE_PROPERTIES \ - { OUString("SoftEdge"), SDRATTR_SOFTEDGE, cppu::UnoType<bool>::get(), 0, 0}, \ { OUString{"SoftEdgeRad"}, SDRATTR_SOFTEDGE_RAD, cppu::UnoType<sal_Int32>::get(), 0, 0, PropertyMoreFlags::METRIC_ITEM}, #define SHADOW_PROPERTIES \ diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 4e23277dd485..3911f61c2849 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -1695,7 +1695,6 @@ namespace xmloff::token { XML_SLANT_Y, XML_SLIDE, XML_SLOW, - XML_SOFTEDGE, XML_SOFTEDGE_RADIUS, XML_SOLID, XML_SOLID_TYPE, |