From d8d31f74236e87ea878f7fac5538e707df5b13ca Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 11 May 2020 17:26:22 +0300 Subject: 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 --- xmloff/source/core/xmltoken.cxx | 1 - xmloff/source/draw/sdpropls.cxx | 1 - xmloff/source/token/tokens.txt | 1 - 3 files changed, 3 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 9c774c5ee46d..18275ebb5ec0 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -1701,7 +1701,6 @@ namespace xmloff::token { TOKEN( "slant-y", XML_SLANT_Y ), TOKEN( "slide", XML_SLIDE ), TOKEN( "slow", XML_SLOW ), - TOKEN( "softedge", XML_SOFTEDGE ), TOKEN( "softedge-radius", XML_SOFTEDGE_RADIUS ), TOKEN( "solid", XML_SOLID ), TOKEN( "solid-type", XML_SOLID_TYPE ), diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index bb2a504e4d8b..a6298d892450 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -159,7 +159,6 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAPV( "GlowEffectTransparency", XML_NAMESPACE_LO_EXT, XML_GLOW_TRANSPARENCY, XML_TYPE_PERCENT16, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), // soft edge attributes - GMAPV( "SoftEdge", XML_NAMESPACE_LO_EXT, XML_SOFTEDGE, XML_SD_TYPE_VISIBLE_HIDDEN, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAPV( "SoftEdgeRad", XML_NAMESPACE_LO_EXT, XML_SOFTEDGE_RADIUS, XML_TYPE_MEASURE , 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), // graphic attributes diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 9a2c343d44c6..42a83f7ae15a 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -1611,7 +1611,6 @@ slant-x slant-y slide slow -softedge softedge-radius solid solid-type -- cgit