diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-06-01 23:04:00 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-06-04 13:34:56 +0200 |
commit | 9da9d3054ab14cde2518cf9de8f7d8455800e551 (patch) | |
tree | a5bccea028ea81d5bb23d1d97214226cb34ed009 /svx | |
parent | 4927143b6652ce2d19e6f476923112f0ab7fc273 (diff) |
Use "Radius" instead of "Rad" for new properties
Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322
Tested-by: Jenkins
Diffstat (limited to 'svx')
-rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 | ||||
-rw-r--r-- | svx/source/sidebar/glow/GlowPropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/softedge/SoftEdgePropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 12 |
5 files changed, 11 insertions, 11 deletions
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; |