include/svx/strings.hrc | 4 ++--
include/svx/svddef.hxx | 6 +++---
include/svx/unoshprp.hxx | 4 ++--
oox/source/drawingml/shape.cxx | 4 ++--
oox/source/export/drawingml.cxx | 8 ++++----
oox/source/token/properties.txt | 2 +-
sd/qa/unit/export-tests-ooxml2.cxx | 4 ++--
sd/qa/unit/export-tests.cxx | 4 ++--
sd/qa/unit/import-tests.cxx | 2 +-
svx/sdi/svx.sdi | 2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 ++--
svx/source/sidebar/glow/GlowPropertyPanel.cxx | 2 +-
svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx | 2 +-
svx/source/svdraw/svdattr.cxx | 12 ++++++------
xmloff/source/draw/sdpropls.cxx | 4 ++--
15 files changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 9da9d3054ab14cde2518cf9de8f7d8455800e551
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Jun 1 23:04:00 2020 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Jun 4 13:34:56 2020 +0200
Use "Radius" instead of "Rad" for new properties
Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322
Tested-by: Jenkins
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index fb9ed922f551..14da2224acf4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -511,10 +511,10 @@
#define SIP_SA_GRAFINVERT
NC_("SIP_SA_GRAFINVERT", "Invert")
#define SIP_SA_GRAFMODE
NC_("SIP_SA_GRAFMODE", "Image mode")
#define SIP_SA_GRAFCROP
NC_("SIP_SA_GRAFCROP", "Crop")
-#define SIP_SA_GLOW_RAD
NC_("SIP_SA_GLOW_RAD", "Radius of glow effect")
+#define SIP_SA_GLOW_RADIUS
NC_("SIP_SA_GLOW_RADIUS", "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_RAD
NC_("SIP_SA_SOFTEDGE_RAD", "Radius of soft edge effect")
+#define SIP_SA_SOFTEDGE_RADIUS
NC_("SIP_SA_SOFTEDGE_RADIUS", "Radius of soft edge 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 378ed9676f22..3b56f691c5fa 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -416,14 +416,14 @@ constexpr TypedWhichId<SvxTextRotateItem>
SDRATTR_TABLE_TEXT_ROTATION (SDRATTR_T
constexpr sal_uInt16 SDRATTR_TABLE_LAST
(SDRATTR_TABLE_TEXT_ROTATION);
constexpr sal_uInt16 SDRATTR_GLOW_FIRST
(SDRATTR_TABLE_LAST+1);
-constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RAD
(SDRATTR_GLOW_FIRST+0);
+constexpr TypedWhichId<SdrMetricItem> SDRATTR_GLOW_RADIUS
(SDRATTR_GLOW_FIRST+0);
constexpr TypedWhichId<XColorItem> SDRATTR_GLOW_COLOR
(SDRATTR_GLOW_FIRST+1);
constexpr TypedWhichId<SdrPercentItem>
SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FIRST + 2);
constexpr sal_uInt16 SDRATTR_GLOW_LAST
(SDRATTR_GLOW_TRANSPARENCY);
constexpr sal_uInt16 SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST
+ 1);
-constexpr TypedWhichId<SdrMetricItem>
SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 0);
-constexpr sal_uInt16
SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RAD);
+constexpr TypedWhichId<SdrMetricItem>
SDRATTR_SOFTEDGE_RADIUS(SDRATTR_SOFTEDGE_FIRST + 0);
+constexpr sal_uInt16
SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RADIUS);
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/unoshprp.hxx b/include/svx/unoshprp.hxx
index d83b24014937..9aa2ecb16dae 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -210,12 +210,12 @@
{ OUString("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP,
::cppu::UnoType<sal_Int16>::get(), 0, 0},
#define GLOW_PROPERTIES \
- { OUString{"GlowEffectRad"}, SDRATTR_GLOW_RAD,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
+ { OUString{"GlowEffectRadius"}, SDRATTR_GLOW_RADIUS,
::cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM}, \
{ 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 SOFTEDGE_PROPERTIES \
- { OUString{"SoftEdgeRad"}, SDRATTR_SOFTEDGE_RAD,
cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
+ { OUString{"SoftEdgeRadius"}, SDRATTR_SOFTEDGE_RADIUS,
cppu::UnoType<sal_Int32>::get(), 0, 0,
PropertyMoreFlags::METRIC_ITEM},
#define SHADOW_PROPERTIES \
{ OUString(UNO_NAME_SHADOW), SDRATTR_SHADOW,
cppu::UnoType<bool>::get(), 0, 0}, \
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index d0f243ffabc1..3fedf4dbb761 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1470,7 +1470,7 @@ Reference< XShape > const & Shape::createAndInsert(
if ( aEffectProperties.maGlow.moGlowRad.has() )
{
uno::Reference<beans::XPropertySet> propertySet (mxShape,
uno::UNO_QUERY);
- propertySet->setPropertyValue("GlowEffectRad",
makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get())));
+ propertySet->setPropertyValue("GlowEffectRadius",
makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get())));
propertySet->setPropertyValue("GlowEffectColor",
makeAny(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper)));
propertySet->setPropertyValue("GlowEffectTransparency",
makeAny(aEffectProperties.maGlow.moGlowColor.getTransparency()));
}
@@ -1480,7 +1480,7 @@ Reference< XShape > const & Shape::createAndInsert(
{
uno::Reference<beans::XPropertySet> propertySet(mxShape,
uno::UNO_QUERY);
propertySet->setPropertyValue(
- "SoftEdgeRad",
makeAny(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.get())));
+ "SoftEdgeRadius",
makeAny(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.get())));
}
}
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 21825902f1a0..fc5807ee61ba 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3746,13 +3746,13 @@ void DrawingML::WriteShapeEffects( const Reference<
XPropertySet >& rXPropSet )
if( GetProperty( rXPropSet, "Shadow" ) )
mAny >>= bHasShadow;
bool bHasEffects = bHasShadow;
- if (!bHasEffects && GetProperty(rXPropSet, "GlowEffectRad"))
+ if (!bHasEffects && GetProperty(rXPropSet, "GlowEffectRadius"))
{
sal_Int32 rad = 0;
mAny >>= rad;
bHasEffects = rad > 0;
}
- if (!bHasEffects && GetProperty(rXPropSet, "SoftEdgeRad"))
+ if (!bHasEffects && GetProperty(rXPropSet, "SoftEdgeRadius"))
{
sal_Int32 rad = 0;
mAny >>= rad;
@@ -3862,7 +3862,7 @@ void DrawingML::WriteShapeEffects( const Reference<
XPropertySet >& rXPropSet )
void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet)
{
sal_Int32 nRad = 0;
- rXPropSet->getPropertyValue("GlowEffectRad") >>= nRad;
+ rXPropSet->getPropertyValue("GlowEffectRadius") >>= nRad;
if (!nRad)
return;
@@ -3884,7 +3884,7 @@ void DrawingML::WriteGlowEffect(const Reference<
XPropertySet >& rXPropSet)
void DrawingML::WriteSoftEdgeEffect(const
css::uno::Reference<css::beans::XPropertySet>& rXPropSet)
{
sal_Int32 nRad = 0;
- rXPropSet->getPropertyValue("SoftEdgeRad") >>= nRad;
+ rXPropSet->getPropertyValue("SoftEdgeRadius") >>= nRad;
if (!nRad)
return;
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 667e479107e5..078284f18e39 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -208,7 +208,7 @@ GapwidthSequence
GenerateVbaEvents
Geometry3D
GlowEffect
-GlowEffectRad
+GlowEffectRadius
GradientName
HatchName
Graphic
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index e71a5228c9eb..c6d2f48aedde 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -2855,7 +2855,7 @@ void SdOOXMLExportTest2::testShapeGlowEffect()
xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
sal_Int32 nRadius = -1;
- xShape->getPropertyValue("GlowEffectRad") >>= nRadius;
+ xShape->getPropertyValue("GlowEffectRadius") >>= nRadius;
CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556
mm/100
Color nColor;
xShape->getPropertyValue("GlowEffectColor") >>= nColor;
@@ -2919,7 +2919,7 @@ void SdOOXMLExportTest2::testShapeSoftEdgeEffect()
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
auto xShapeProps(getShapeFromPage(0, 0, xDocShRef));
sal_Int32 nRadius = -1;
- xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRadius;
+ xShapeProps->getPropertyValue("SoftEdgeRadius") >>= nRadius;
CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nRadius); // 18 pt
}
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 6711333c866e..a2186fae62af 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1248,7 +1248,7 @@ void SdExportTest::testGlow()
// Check glow properties
sal_Int32 nGlowEffectRad = 0;
- CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRad") >>=
nGlowEffectRad);
+ CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRadius") >>=
nGlowEffectRad);
CPPUNIT_ASSERT_EQUAL(sal_Int32(529), nGlowEffectRad); // 15 pt =
529.166... mm/100
sal_Int32 nGlowEffectColor = 0;
CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectColor") >>=
nGlowEffectColor);
@@ -1289,7 +1289,7 @@ void SdExportTest::testSoftEdges()
// Check property
sal_Int32 nRad = 0;
- CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdgeRad") >>= nRad);
+ CPPUNIT_ASSERT(xShapeProps->getPropertyValue("SoftEdgeRadius") >>= nRad);
CPPUNIT_ASSERT_EQUAL(sal_Int32(635), nRad); // 18 pt
// Test ODF element
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d1960223a1b9..bc80fb5e3ca3 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -3111,7 +3111,7 @@ void SdImportTest::testShapeGlowEffectPPTXImpoer()
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
sal_Int32 nRadius = -1;
- xShape->getPropertyValue("GlowEffectRad") >>= nRadius;
+ xShape->getPropertyValue("GlowEffectRadius") >>= nRadius;
CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556
mm/100
Color nColor;
xShape->getPropertyValue("GlowEffectColor") >>= nColor;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index aedcfda602f4..fcf88f0f0659 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -12307,7 +12307,7 @@ SdrPercentItem GlowTransparency
SID_ATTR_GLOW_TRANSPARENCY
GroupId = SfxGroupId::Document;
]
-SdrMetricItem SoftEdgeRad SID_ATTR_SOFTEDGE_RADIUS
+SdrMetricItem SoftEdgeRadius SID_ATTR_SOFTEDGE_RADIUS
[
AutoUpdate = TRUE,
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index fbfa6ebaf67f..027d6fe94dae 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -215,7 +215,7 @@ namespace drawinglayer
attribute::SdrGlowAttribute createNewSdrGlowAttribute(const
SfxItemSet& rSet)
{
- sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue();
+ sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RADIUS).GetValue();
if (!nRadius)
return attribute::SdrGlowAttribute();
Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue());
@@ -229,7 +229,7 @@ namespace drawinglayer
sal_Int32 getSoftEdgeRadius(const SfxItemSet& rSet)
{
- return rSet.Get(SDRATTR_SOFTEDGE_RAD).GetValue();
+ return rSet.Get(SDRATTR_SOFTEDGE_RADIUS).GetValue();
}
} // end of anonymous namespace
} // end of namespace drawinglayer
diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.cxx
b/svx/source/sidebar/glow/GlowPropertyPanel.cxx
index 26493c3c250e..acb63e090acc 100644
--- a/svx/source/sidebar/glow/GlowPropertyPanel.cxx
+++ b/svx/source/sidebar/glow/GlowPropertyPanel.cxx
@@ -75,7 +75,7 @@ IMPL_LINK_NOARG(GlowPropertyPanel, ModifyGlowColorHdl,
ColorListBox&, void)
IMPL_LINK_NOARG(GlowPropertyPanel, ModifyGlowRadiusHdl,
weld::MetricSpinButton&, void)
{
- SdrMetricItem aItem(SDRATTR_GLOW_RAD,
mxGlowRadius->get_value(FieldUnit::MM_100TH));
+ SdrMetricItem aItem(SDRATTR_GLOW_RADIUS,
mxGlowRadius->get_value(FieldUnit::MM_100TH));
mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_GLOW_RADIUS,
SfxCallMode::RECORD, { &aItem });
}
diff --git a/svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx
b/svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx
index 66faf7815cca..35511498fe44 100644
--- a/svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx
+++ b/svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx
@@ -49,7 +49,7 @@ void SoftEdgePropertyPanel::Initialize()
IMPL_LINK_NOARG(SoftEdgePropertyPanel, ModifySoftEdgeRadiusHdl,
weld::MetricSpinButton&, void)
{
- SdrMetricItem aItem(SDRATTR_SOFTEDGE_RAD,
mxSoftEdgeRadius->get_value(FieldUnit::MM_100TH));
+ SdrMetricItem aItem(SDRATTR_SOFTEDGE_RADIUS,
mxSoftEdgeRadius->get_value(FieldUnit::MM_100TH));
mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_SOFTEDGE_RADIUS,
SfxCallMode::RECORD,
{ &aItem });
}
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index fddb2e89adc0..f57b523db96e 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -328,11 +328,11 @@ SdrItemPool::SdrItemPool(
rPoolDefaults[ SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ] = new
SvxLineItem( SDRATTR_TABLE_BORDER_BLTR );
rPoolDefaults[ SDRATTR_TABLE_TEXT_ROTATION - SDRATTR_START ] = new
SvxTextRotateItem(0, SDRATTR_TABLE_TEXT_ROTATION);
- rPoolDefaults[ SDRATTR_GLOW_RAD - SDRATTR_START ] = new
SdrMetricItem(SDRATTR_GLOW_RAD, 0);
+ rPoolDefaults[ SDRATTR_GLOW_RADIUS - SDRATTR_START ] = new
SdrMetricItem(SDRATTR_GLOW_RADIUS, 0);
rPoolDefaults[ SDRATTR_GLOW_COLOR - SDRATTR_START ] = new
XColorItem(SDRATTR_GLOW_COLOR, aNullCol);
rPoolDefaults[ SDRATTR_GLOW_TRANSPARENCY - SDRATTR_START ] = new
SdrPercentItem(SDRATTR_GLOW_TRANSPARENCY, 0);
- rPoolDefaults[SDRATTR_SOFTEDGE_RAD - SDRATTR_START] = new
SdrMetricItem(SDRATTR_SOFTEDGE_RAD, 0);
+ rPoolDefaults[SDRATTR_SOFTEDGE_RADIUS - SDRATTR_START] = new
SdrMetricItem(SDRATTR_SOFTEDGE_RADIUS, 0);
// set own ItemInfos
mpLocalItemInfos[SDRATTR_SHADOW-SDRATTR_START]._nSID=SID_ATTR_FILL_SHADOW;
@@ -348,11 +348,11 @@ SdrItemPool::SdrItemPool(
mpLocalItemInfos[SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ]._nSID =
SID_ATTR_BORDER_DIAG_TLBR;
mpLocalItemInfos[SDRATTR_TABLE_BORDER_BLTR - SDRATTR_START ]._nSID =
SID_ATTR_BORDER_DIAG_BLTR;
- mpLocalItemInfos[SDRATTR_GLOW_RAD - SDRATTR_START]._nSID =
SID_ATTR_GLOW_RADIUS;
+ mpLocalItemInfos[SDRATTR_GLOW_RADIUS - SDRATTR_START]._nSID =
SID_ATTR_GLOW_RADIUS;
mpLocalItemInfos[SDRATTR_GLOW_COLOR - SDRATTR_START]._nSID =
SID_ATTR_GLOW_COLOR;
mpLocalItemInfos[SDRATTR_GLOW_TRANSPARENCY - SDRATTR_START]._nSID =
SID_ATTR_GLOW_TRANSPARENCY;
- mpLocalItemInfos[SDRATTR_SOFTEDGE_RAD - SDRATTR_START]._nSID =
SID_ATTR_SOFTEDGE_RADIUS;
+ mpLocalItemInfos[SDRATTR_SOFTEDGE_RADIUS - SDRATTR_START]._nSID =
SID_ATTR_SOFTEDGE_RADIUS;
// it's my own creation level, set Defaults and ItemInfos
SetDefaults(mpLocalPoolDefaults);
@@ -460,11 +460,11 @@ OUString SdrItemPool::GetItemName(sal_uInt16 nWhich)
case SDRATTR_SHADOW3D : pResId = SIP_SA_SHADOW3D;break;
case SDRATTR_SHADOWPERSP : pResId = SIP_SA_SHADOWPERSP;break;
- case SDRATTR_GLOW_RAD : pResId = SIP_SA_GLOW_RAD;break;
+ case SDRATTR_GLOW_RADIUS : pResId = SIP_SA_GLOW_RADIUS;break;
case SDRATTR_GLOW_COLOR : pResId = SIP_SA_GLOW_COLOR;break;
case SDRATTR_GLOW_TRANSPARENCY : pResId =
SIP_SA_GLOW_TRANSPARENCY;break;
- case SDRATTR_SOFTEDGE_RAD : pResId = SIP_SA_SOFTEDGE_RAD; break;
+ case SDRATTR_SOFTEDGE_RADIUS : pResId = SIP_SA_SOFTEDGE_RADIUS;
break;
case SDRATTR_CAPTIONTYPE : pResId = SIP_SA_CAPTIONTYPE;break;
case SDRATTR_CAPTIONFIXEDANGLE: pResId =
SIP_SA_CAPTIONFIXEDANGLE;break;
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index c9725c2a5ca8..d55c2cec6b6a 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -153,12 +153,12 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "ShadowTransparence", XML_NAMESPACE_DRAW,
XML_SHADOW_OPACITY, XML_TYPE_NEG_PERCENT, 0 ),
// glow attributes
- GMAPV( "GlowEffectRad", XML_NAMESPACE_LO_EXT,
XML_GLOW_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
+ GMAPV( "GlowEffectRadius", XML_NAMESPACE_LO_EXT,
XML_GLOW_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
GMAPV( "GlowEffectColor", XML_NAMESPACE_LO_EXT,
XML_GLOW_COLOR, XML_TYPE_COLOR , 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
GMAPV( "GlowEffectTransparency", XML_NAMESPACE_LO_EXT,
XML_GLOW_TRANSPARENCY, XML_TYPE_PERCENT16, 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
// soft edge attributes
- GMAPV( "SoftEdgeRad", XML_NAMESPACE_LO_EXT,
XML_SOFTEDGE_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
+ GMAPV( "SoftEdgeRadius", XML_NAMESPACE_LO_EXT,
XML_SOFTEDGE_RADIUS, XML_TYPE_MEASURE , 0,
SvtSaveOptions::ODFSVER_FUTURE_EXTENDED),
// graphic attributes
GMAP( "GraphicColorMode", XML_NAMESPACE_DRAW,
XML_COLOR_MODE, XML_TYPE_COLOR_MODE, 0 ), // exists in SW, too,
with same property name
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
