diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-03 14:35:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-04 08:47:36 +0200 |
commit | e0c64cbeaf458cabcf8f4ac7c8aac4cd1896273c (patch) | |
tree | bf166a6e1f79f5a7f61210480ff28b843f247d27 /svx | |
parent | ac8fc5a6a5a1adef7aaa8aa901439e268283d113 (diff) |
rename SIP_SA_EDGELINEDELTAANZ->SIP_SA_EDGELINEDELTACOUNT
and SIP_SA_EDGELINEDELTAANZ->SIP_SA_EDGELINEDELTACOUNT
Change-Id: Ib6c370025a56586df1cdf7abcab2f0dfe599a64a
Reviewed-on: https://gerrit.libreoffice.org/40738
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/connctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index d622a7d52e6d..3b3c57eb1c17 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -244,8 +244,8 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount() const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); - if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ)) - nCount = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); + if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTACOUNT)) + nCount = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTACOUNT)).GetValue(); return nCount; } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 34400847bd6d..9b034d60144a 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -174,7 +174,7 @@ SdrItemPool::SdrItemPool( rPoolDefaults[SDRATTR_EDGENODE2VERTDIST-SDRATTR_START]=new SdrEdgeNode2VertDistItem(nDefEdgeDist); rPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem; rPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem; - rPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaCountItem; + rPoolDefaults[SDRATTR_EDGELINEDELTACOUNT-SDRATTR_START]=new SdrEdgeLineDeltaCountItem; rPoolDefaults[SDRATTR_EDGELINE1DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE1DELTA, 0); rPoolDefaults[SDRATTR_EDGELINE2DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE2DELTA, 0); rPoolDefaults[SDRATTR_EDGELINE3DELTA -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE3DELTA, 0); @@ -493,7 +493,7 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_EDGENODE2VERTDIST : pResId = SIP_SA_EDGENODE2VERTDIST;break; case SDRATTR_EDGENODE1GLUEDIST : pResId = SIP_SA_EDGENODE1GLUEDIST;break; case SDRATTR_EDGENODE2GLUEDIST : pResId = SIP_SA_EDGENODE2GLUEDIST;break; - case SDRATTR_EDGELINEDELTAANZ : pResId = SIP_SA_EDGELINEDELTAANZ;break; + case SDRATTR_EDGELINEDELTACOUNT : pResId = SIP_SA_EDGELINEDELTACOUNT;break; case SDRATTR_EDGELINE1DELTA : pResId = SIP_SA_EDGELINE1DELTA;break; case SDRATTR_EDGELINE2DELTA : pResId = SIP_SA_EDGELINE2DELTA;break; case SDRATTR_EDGELINE3DELTA : pResId = SIP_SA_EDGELINE3DELTA;break; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index b7bd3b4388de..81792c7ab586 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -804,7 +804,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI } } break; - case SDRATTR_EDGELINEDELTAANZ: return true; + case SDRATTR_EDGELINEDELTACOUNT: return true; case SDRATTR_EDGELINE1DELTA: case SDRATTR_EDGELINE2DELTA: case SDRATTR_EDGELINE3DELTA: { @@ -815,7 +815,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI } if (eKind!=SdrEdgeKind::OrthoLines && eKind!=SdrEdgeKind::Bezier) return true; } - if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) { + if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTACOUNT,pItem)) { sal_uInt16 nCount=static_cast<const SdrEdgeLineDeltaCountItem*>(pItem)->GetValue(); if (nCount==0) return true; if (nCount==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true; diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index c2081a03df84..658e476e6e5f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -258,7 +258,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() { const SfxItemSet& rSet = GetObjectItemSet(); SdrEdgeKind eKind = static_cast<const SdrEdgeKindItem&>(rSet.Get(SDRATTR_EDGEKIND)).GetValue(); - sal_Int32 nValAnz = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue(); + sal_Int32 nValAnz = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTACOUNT)).GetValue(); sal_Int32 nVal1 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE1DELTA)).GetValue(); sal_Int32 nVal2 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE2DELTA)).GetValue(); sal_Int32 nVal3 = static_cast<const SdrMetricItem&>(rSet.Get(SDRATTR_EDGELINE3DELTA)).GetValue(); |