[Libreoffice-commits] core.git: chart2/source cui/source include/svx sd/source svx/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 29 12:57:49 UTC 2021
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2 +-
cui/source/tabpages/transfrm.cxx | 6 +++---
include/svx/sderitm.hxx | 2 +-
include/svx/strings.hrc | 2 +-
include/svx/svddef.hxx | 2 +-
include/svx/unoshprp.hxx | 2 +-
sd/source/ui/view/sdview3.cxx | 2 +-
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 +-
13 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit e4fdf7f5bf40ee289ac3441eb8b8963c10caf6a1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Apr 29 10:39:22 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 29 14:57:06 2021 +0200
rename ECKEN -> CORNER
Change-Id: I24438213431bd2866e2bcefc8a054a03bc975ef4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114841
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index ced8421d211b..66769a1dee91 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -256,7 +256,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const
SfxItemSet aFullSet(
GetModel()->GetItemPool(),
svl::Items<
- 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,
SID_ATTR_METRIC, SID_ATTR_METRIC>{});
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index a76f1413c39c..fe684f446e44 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -73,8 +73,8 @@ const sal_uInt16 SvxAngleTabPage::pAngleRanges[] =
const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
{
- SDRATTR_ECKENRADIUS,
- SDRATTR_ECKENRADIUS,
+ SDRATTR_CORNER_RADIUS,
+ SDRATTR_CORNER_RADIUS,
SID_ATTR_TRANSFORM_SHEAR,
SID_ATTR_TRANSFORM_SHEAR_VERTICAL,
SID_ATTR_TRANSFORM_INTERN,
@@ -578,7 +578,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
}
else
{
- pItem = GetItem( *rAttrs, SDRATTR_ECKENRADIUS );
+ pItem = GetItem( *rAttrs, SDRATTR_CORNER_RADIUS );
if( pItem )
{
diff --git a/include/svx/sderitm.hxx b/include/svx/sderitm.hxx
index 954e2286d6e5..2afd50ef80ad 100644
--- a/include/svx/sderitm.hxx
+++ b/include/svx/sderitm.hxx
@@ -24,7 +24,7 @@
inline SdrMetricItem makeSdrEckenradiusItem(tools::Long nRadius)
{
- return SdrMetricItem(SDRATTR_ECKENRADIUS, nRadius);
+ return SdrMetricItem(SDRATTR_CORNER_RADIUS, nRadius);
}
#endif
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 466c276b0d7c..35fa94d665cb 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -380,7 +380,7 @@
#define SIP_SA_CAPTIONESCABS NC_("SIP_SA_CAPTIONESCABS", "Absolute exit of legend")
#define SIP_SA_CAPTIONLINELEN NC_("SIP_SA_CAPTIONLINELEN", "Legend line length")
#define SIP_SA_CAPTIONFITLINELEN NC_("SIP_SA_CAPTIONFITLINELEN", "AutoLength of legend lines")
-#define SIP_SA_ECKENRADIUS NC_("SIP_SA_ECKENRADIUS", "Corner radius")
+#define SIP_SA_CORNER_RADIUS NC_("SIP_SA_CORNER_RADIUS", "Corner radius")
#define SIP_SA_TEXT_MINFRAMEHEIGHT NC_("SIP_SA_TEXT_MINFRAMEHEIGHT", "Minimal frame height")
#define SIP_SA_TEXT_AUTOGROWHEIGHT NC_("SIP_SA_TEXT_AUTOGROWHEIGHT", "AutoFit height")
#define SIP_SA_TEXT_FITTOSIZE NC_("SIP_SA_TEXT_FITTOSIZE", "Fit text to frame")
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 30031e20dde2..6061293f9421 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -204,7 +204,7 @@ constexpr TypedWhichId<SdrCaptionFitLineLenItem> SDRATTR_CAPTIONFITLINELEN (SDRA
constexpr sal_uInt16 SDRATTR_CAPTION_LAST (SDRATTR_CAPTIONFITLINELEN); /* 1094 */ /* 1094 */ /* 1077 */ /* Pool V1: 1050 */
constexpr sal_uInt16 SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1); /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */
-constexpr TypedWhichId<SdrMetricItem> SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0); /* 1097 */ /* 1097 */ /* 1080 long, def=0 */
+constexpr TypedWhichId<SdrMetricItem> SDRATTR_CORNER_RADIUS (SDRATTR_MISC_FIRST + 0); /* 1097 */ /* 1097 */ /* 1080 long, def=0 */
constexpr TypedWhichId<SdrMetricItem> SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1); /* 1098 */ /* 1098 */ /* 1081 long, def=0 */
constexpr TypedWhichId<SdrOnOffItem> SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2); /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */
constexpr TypedWhichId<SdrTextFitToSizeTypeItem> SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3); /* 1100 */ /* 1100 */ /* 1083 enum, def=css::drawing::TextFitToSizeType_NONE */
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 840214f5e928..c98b5b9eb433 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -288,7 +288,7 @@
{ u"" UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 },
#define EDGERADIUS_PROPERTIES \
- { u"" UNO_NAME_EDGERADIUS, SDRATTR_ECKENRADIUS , ::cppu::UnoType<sal_Int32>::get() , 0, 0, PropertyMoreFlags::METRIC_ITEM},
+ { u"" UNO_NAME_EDGERADIUS, SDRATTR_CORNER_RADIUS , ::cppu::UnoType<sal_Int32>::get() , 0, 0, PropertyMoreFlags::METRIC_ITEM},
#define TEXT_PROPERTIES_DEFAULTS\
{ u"" UNO_NAME_TEXT_WRITINGMODE, SDRATTR_TEXTDIRECTION, ::cppu::UnoType<css::text::WritingMode>::get(), 0, 0},\
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 4bca10f3b797..3cad2f275af4 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -765,7 +765,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
gradients (rectangles) in the gallery with corner
radius of 0. We should not use that on the
object. */
- aSet.ClearItem( SDRATTR_ECKENRADIUS );
+ aSet.ClearItem( SDRATTR_CORNER_RADIUS );
const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pObj);
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<const SdrMetricItem*>(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<SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS>{});
- aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad));
+ SfxItemSet aSet(*mpLineAttr->GetPool(), svl::Items<SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS>{});
+ 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))
More information about the Libreoffice-commits
mailing list