From e4fdf7f5bf40ee289ac3441eb8b8963c10caf6a1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 29 Apr 2021 10:39:22 +0200 Subject: rename ECKEN -> CORNER Change-Id: I24438213431bd2866e2bcefc8a054a03bc975ef4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114841 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 2 +- svx/source/svdraw/svdattr.cxx | 4 ++-- svx/source/svdraw/svdedtv1.cxx | 10 +++++----- svx/source/svdraw/svdfmtf.cxx | 4 ++-- svx/source/svdraw/svdotext.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'svx/source') diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index e2c3db4b08b2..e1b8d69cd906 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -61,7 +61,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrRectObj::createV aObjectRange.getMinX(), aObjectRange.getMinY())); // calculate corner radius - sal_uInt32 nCornerRadius(rItemSet.Get(SDRATTR_ECKENRADIUS).GetValue()); + sal_uInt32 nCornerRadius(rItemSet.Get(SDRATTR_CORNER_RADIUS).GetValue()); double fCornerRadiusX; double fCornerRadiusY; drawinglayer::primitive2d::calculateRelativeCornerRadius(nCornerRadius, aObjectRange, fCornerRadiusX, fCornerRadiusY); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 4c1a43de57a1..8c777fa8af54 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -144,7 +144,7 @@ SdrItemPool::SdrItemPool( rPoolDefaults[SDRATTR_CAPTIONESCABS -SDRATTR_START]=new SdrCaptionEscAbsItem ; rPoolDefaults[SDRATTR_CAPTIONLINELEN -SDRATTR_START]=new SdrCaptionLineLenItem ; rPoolDefaults[SDRATTR_CAPTIONFITLINELEN-SDRATTR_START]=new SdrCaptionFitLineLenItem; - rPoolDefaults[SDRATTR_ECKENRADIUS -SDRATTR_START]=new SdrMetricItem(SDRATTR_ECKENRADIUS, 0); + rPoolDefaults[SDRATTR_CORNER_RADIUS -SDRATTR_START]=new SdrMetricItem(SDRATTR_CORNER_RADIUS, 0); rPoolDefaults[SDRATTR_TEXT_MINFRAMEHEIGHT -SDRATTR_START]=new SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, 0); rPoolDefaults[SDRATTR_TEXT_AUTOGROWHEIGHT -SDRATTR_START]=new SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT, true); rPoolDefaults[SDRATTR_TEXT_FITTOSIZE -SDRATTR_START]=new SdrTextFitToSizeTypeItem; @@ -477,7 +477,7 @@ OUString SdrItemPool::GetItemName(sal_uInt16 nWhich) case SDRATTR_CAPTIONLINELEN : pResId = SIP_SA_CAPTIONLINELEN;break; case SDRATTR_CAPTIONFITLINELEN: pResId = SIP_SA_CAPTIONFITLINELEN;break; - case SDRATTR_ECKENRADIUS : pResId = SIP_SA_ECKENRADIUS;break; + case SDRATTR_CORNER_RADIUS : pResId = SIP_SA_CORNER_RADIUS;break; case SDRATTR_TEXT_MINFRAMEHEIGHT : pResId = SIP_SA_TEXT_MINFRAMEHEIGHT;break; case SDRATTR_TEXT_AUTOGROWHEIGHT : pResId = SIP_SA_TEXT_AUTOGROWHEIGHT;break; case SDRATTR_TEXT_FITTOSIZE : pResId = SIP_SA_TEXT_FITTOSIZE;break; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 247fb8060b4b..e5b7ac5d2fc6 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1342,7 +1342,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const SfxItemSet aRetSet( mpModel->GetItemPool(), svl::Items< // SID_ATTR_TRANSFORM_... from s:svxids.hrc - SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS, + SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS, SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE, SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT>{}); @@ -1444,10 +1444,10 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const aRetSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_AUTOHEIGHT,bAutoGrow)); } - eState=aMarkAttr.GetItemState(SDRATTR_ECKENRADIUS); - tools::Long nRadius=aMarkAttr.Get(SDRATTR_ECKENRADIUS).GetValue(); + eState=aMarkAttr.GetItemState(SDRATTR_CORNER_RADIUS); + tools::Long nRadius=aMarkAttr.Get(SDRATTR_CORNER_RADIUS).GetValue(); if (eState==SfxItemState::DONTCARE) { - aRetSet.InvalidateItem(SDRATTR_ECKENRADIUS); + aRetSet.InvalidateItem(SDRATTR_CORNER_RADIUS); } else if (eState==SfxItemState::SET) { aRetSet.Put(makeSdrEckenradiusItem(nRadius)); } @@ -1668,7 +1668,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr, bool addPageMargin } // corner radius - if (m_bEdgeRadiusAllowed && SfxItemState::SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,true,&pPoolItem)) { + if (m_bEdgeRadiusAllowed && SfxItemState::SET==rAttr.GetItemState(SDRATTR_CORNER_RADIUS,true,&pPoolItem)) { tools::Long nRadius=static_cast(pPoolItem)->GetValue(); aSetAttr.Put(makeSdrEckenradiusItem(nRadius)); bSetAttr=true; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index eb60ff92fa56..c2e43c07d43c 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -723,8 +723,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction const & rAct) SetAttributes(pRect); tools::Long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2; if (nRad!=0) { - SfxItemSet aSet(*mpLineAttr->GetPool(), svl::Items{}); - aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad)); + SfxItemSet aSet(*mpLineAttr->GetPool(), svl::Items{}); + aSet.Put(SdrMetricItem(SDRATTR_CORNER_RADIUS, nRad)); pRect->SetMergedItemSet(aSet); } InsertObj(pRect); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index efb0c46f8c71..1d3f0ba2e4bf 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1709,7 +1709,7 @@ bool SdrTextObj::IsReallyEdited() const tools::Long SdrTextObj::GetEckenradius() const { - return GetObjectItemSet().Get(SDRATTR_ECKENRADIUS).GetValue(); + return GetObjectItemSet().Get(SDRATTR_CORNER_RADIUS).GetValue(); } tools::Long SdrTextObj::GetMinTextFrameHeight() const diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 3f933850fdf2..972879ae4336 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1639,7 +1639,7 @@ void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& bool bIsNotPersist = pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST && pMap->nWID != SDRATTR_TEXTDIRECTION; - if( pMap->nWID == SDRATTR_ECKENRADIUS ) + if( pMap->nWID == SDRATTR_CORNER_RADIUS ) { sal_Int32 nCornerRadius = 0; if( !(rVal >>= nCornerRadius) || (nCornerRadius < 0) || (nCornerRadius > 5000000)) -- cgit