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>

8 files changed, 12 insertions, 12 deletions

diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index aedcdeec4946..118bb62de742 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -261,9 +261,9 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
     m_pMtrFldLine3->SaveValue();
 
     // SdrEdgeLineDeltaAnzItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTAANZ );
+    pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTACOUNT );
     if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTAANZ );
+        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTACOUNT );
     if( pItem )
     {
         sal_uInt16 nValue = static_cast<const SdrEdgeLineDeltaCountItem*>( pItem )->GetValue();
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 6416454d1160..a706fa6d0c61 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -416,7 +416,7 @@
 #define SIP_SA_EDGENODE2VERTDIST                            NC_("SIP_SA_EDGENODE2VERTDIST", "Vert. spacing object 2")
 #define SIP_SA_EDGENODE1GLUEDIST                            NC_("SIP_SA_EDGENODE1GLUEDIST", "Glue spacing object 1")
 #define SIP_SA_EDGENODE2GLUEDIST                            NC_("SIP_SA_EDGENODE2GLUEDIST", "Glue spacing object 2")
-#define SIP_SA_EDGELINEDELTAANZ                             NC_("SIP_SA_EDGELINEDELTAANZ", "Number of movable lines")
+#define SIP_SA_EDGELINEDELTACOUNT                           NC_("SIP_SA_EDGELINEDELTACOUNT", "Number of movable lines")
 #define SIP_SA_EDGELINE1DELTA                               NC_("SIP_SA_EDGELINE1DELTA", "Offset line 1")
 #define SIP_SA_EDGELINE2DELTA                               NC_("SIP_SA_EDGELINE2DELTA", "Offset line 2")
 #define SIP_SA_EDGELINE3DELTA                               NC_("SIP_SA_EDGELINE3DELTA", "Offset line 3")
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 334a1c37ce5f..deca8bcf2310 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -122,7 +122,7 @@
 #define SDRATTR_EDGENODE2VERTDIST       (SDRATTR_EDGE_FIRST + 4)   /*   1131 */ /* Pool V4 */
 #define SDRATTR_EDGENODE1GLUEDIST       (SDRATTR_EDGE_FIRST + 5)   /*   1132 */ /* Pool V4 */
 #define SDRATTR_EDGENODE2GLUEDIST       (SDRATTR_EDGE_FIRST + 6)   /*   1133 */ /* Pool V4 */
-#define SDRATTR_EDGELINEDELTAANZ        (SDRATTR_EDGE_FIRST + 7)   /*   1134 */ /* Pool V4 */
+#define SDRATTR_EDGELINEDELTACOUNT      (SDRATTR_EDGE_FIRST + 7)   /*   1134 */ /* Pool V4 */
 #define SDRATTR_EDGELINE1DELTA          (SDRATTR_EDGE_FIRST + 8)   /*   1135 */ /* Pool V4 */
 #define SDRATTR_EDGELINE2DELTA          (SDRATTR_EDGE_FIRST + 9)   /*   1136 */ /* Pool V4 */
 #define SDRATTR_EDGELINE3DELTA          (SDRATTR_EDGE_FIRST +10)   /*   1137 */ /* Pool V4 */
diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index 16ff9b22f01f..c2ecfa5d8248 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -25,7 +25,7 @@
 
 class SdrEdgeLineDeltaCountItem: public SfxUInt16Item {
 public:
-    SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
+    SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTACOUNT,nVal) {}
     virtual SfxPoolItem* Clone(SfxItemPool*) const override
     {
         return new SdrEdgeLineDeltaCountItem(*this);
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();