[Libreoffice-commits] core.git: cui/source include/svx svx/source

[Miklos Vajna]

 cui/source/tabpages/connect.cxx |    2 +-
 include/svx/sxelditm.hxx        |    8 ++++----
 svx/source/dialog/connctrl.cxx  |    2 +-
 svx/source/svdraw/svdattr.cxx   |    2 +-
 svx/source/svdraw/svdibrow.cxx  |    2 +-
 svx/source/svdraw/svdoedge.cxx  |    4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit e3b0d5987b817af86e2ecb3616b8d1bde306ba08
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 25 09:14:05 2016 +0100

    svx: SdrEdgeLineDeltaAnzItem -> SdrEdgeLineDeltaCountItem
    
    Change-Id: I91791a3ea21ca7a68d4d1aa49e29cabc38c777ee

diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 0f1af81..c928867 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -267,7 +267,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
         pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTAANZ );
     if( pItem )
     {
-        sal_uInt16 nValue = static_cast<const SdrEdgeLineDeltaAnzItem*>( pItem )->GetValue();
+        sal_uInt16 nValue = static_cast<const SdrEdgeLineDeltaCountItem*>( pItem )->GetValue();
         if( nValue <= 2 )
         {
             m_pFtLine3->Enable( false );
diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index db37bca..b27e9c1 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -23,13 +23,13 @@
 #include <svx/sdmetitm.hxx>
 #include <svx/svxdllapi.h>
 
-class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item {
+class SdrEdgeLineDeltaCountItem: public SfxUInt16Item {
 public:
-    SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
-    SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn)  {}
+    SdrEdgeLineDeltaCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {}
+    SdrEdgeLineDeltaCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn)  {}
     virtual SfxPoolItem* Clone(SfxItemPool*) const override
     {
-        return new SdrEdgeLineDeltaAnzItem(*this);
+        return new SdrEdgeLineDeltaCountItem(*this);
     }
 };
 
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 79e01c4..6360cfd 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -252,7 +252,7 @@ sal_uInt16 SvxXConnectionPreview::GetLineDeltaCount()
     sal_uInt16 nCount(0);
 
     if(SfxItemState::DONTCARE != rSet.GetItemState(SDRATTR_EDGELINEDELTAANZ))
-        nCount = static_cast<const SdrEdgeLineDeltaAnzItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue();
+        nCount = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue();
 
     return nCount;
 }
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index e9510a6..a93510a 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -171,7 +171,7 @@ SdrItemPool::SdrItemPool(
     mppLocalPoolDefaults[SDRATTR_EDGENODE2VERTDIST-SDRATTR_START]=new SdrEdgeNode2VertDistItem(nDefEdgeDist);
     mppLocalPoolDefaults[SDRATTR_EDGENODE1GLUEDIST-SDRATTR_START]=new SdrEdgeNode1GlueDistItem;
     mppLocalPoolDefaults[SDRATTR_EDGENODE2GLUEDIST-SDRATTR_START]=new SdrEdgeNode2GlueDistItem;
-    mppLocalPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaAnzItem;
+    mppLocalPoolDefaults[SDRATTR_EDGELINEDELTAANZ -SDRATTR_START]=new SdrEdgeLineDeltaCountItem;
     mppLocalPoolDefaults[SDRATTR_EDGELINE1DELTA   -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE1DELTA, 0);
     mppLocalPoolDefaults[SDRATTR_EDGELINE2DELTA   -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE2DELTA, 0);
     mppLocalPoolDefaults[SDRATTR_EDGELINE3DELTA   -SDRATTR_START]=new SdrMetricItem(SDRATTR_EDGELINE3DELTA, 0);
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 2da9c09..d27967b 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -833,7 +833,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
                 if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return true;
             }
             if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) {
-                sal_uInt16 nCount=static_cast<const SdrEdgeLineDeltaAnzItem*>(pItem)->GetValue();
+                sal_uInt16 nCount=static_cast<const SdrEdgeLineDeltaCountItem*>(pItem)->GetValue();
                 if (nCount==0) return true;
                 if (nCount==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true;
                 if (nCount==2 && nWhich>SDRATTR_EDGELINE2DELTA) return true;
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 6f35967..aa064ce 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -262,7 +262,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 SdrEdgeLineDeltaAnzItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).GetValue();
+    sal_Int32 nValAnz = static_cast<const SdrEdgeLineDeltaCountItem&>(rSet.Get(SDRATTR_EDGELINEDELTAANZ)).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();
@@ -316,7 +316,7 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
         // Here no more notifying is necessary, just local changes are OK.
         if(n != nValAnz)
         {
-            GetProperties().SetObjectItemDirect(SdrEdgeLineDeltaAnzItem(n));
+            GetProperties().SetObjectItemDirect(SdrEdgeLineDeltaCountItem(n));
         }
 
         if(nVals[0] != nVal1)