Consistency around SdrAngleItem in svx/sxciaitm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I8e76e4751e50f5952c6dfff9ee10362166bf0523

9 files changed, 26 insertions, 36 deletions

diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx
index 1ce901e7eb3b..27bc07a1853f 100644
--- a/include/svx/sxciaitm.hxx
+++ b/include/svx/sxciaitm.hxx
@@ -22,23 +22,13 @@
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
 
+inline SdrAngleItem makeSdrCircStartAngleItem(long nAngle) {
+    return SdrAngleItem(SDRATTR_CIRCSTARTANGLE, nAngle);
+}
 
-// class SdrCircStartAngleItem
-
-class SdrCircStartAngleItem: public SdrAngleItem {
-public:
-    SdrCircStartAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,nAngle) {}
-    SdrCircStartAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_CIRCSTARTANGLE,rIn)    {}
-};
-
-
-// class SdrCircEndAngleItem
-
-class SdrCircEndAngleItem: public SdrAngleItem {
-public:
-    SdrCircEndAngleItem(long nAngle=36000): SdrAngleItem(SDRATTR_CIRCENDANGLE,nAngle) {}
-    SdrCircEndAngleItem(SvStream& rIn):     SdrAngleItem(SDRATTR_CIRCENDANGLE,rIn)    {}
-};
+inline SdrAngleItem makeSdrCircEndAngleItem(long nAngle) {
+    return SdrAngleItem(SDRATTR_CIRCENDANGLE, nAngle);
+}
 
 #endif
 
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 0340bcfe1d8b..f1994f109050 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -202,8 +202,8 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle
             pObj->SetLogicRect(aRect);
 
             SfxItemSet aAttr(pDrDoc->GetItemPool());
-            aAttr.Put(SdrCircStartAngleItem(9000));
-            aAttr.Put(SdrCircEndAngleItem(0));
+            aAttr.Put(makeSdrCircStartAngleItem(9000));
+            aAttr.Put(makeSdrCircEndAngleItem(0));
 
             pObj->SetMergedItemSet(aAttr);
         }
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 312e32f5b0bf..2fce438a7c2c 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -245,8 +245,8 @@ SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Recta
             pObj->SetLogicRect(aRect);
 
             SfxItemSet aAttr(mpDoc->GetPool());
-            aAttr.Put(SdrCircStartAngleItem(9000));
-            aAttr.Put(SdrCircEndAngleItem(0));
+            aAttr.Put(makeSdrCircStartAngleItem(9000));
+            aAttr.Put(makeSdrCircEndAngleItem(0));
 
             if(SID_DRAW_PIE_NOFILL == nID ||
                 SID_DRAW_CIRCLEPIE_NOFILL == nID ||
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index bd07becacab3..5acec95ec293 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -86,8 +86,8 @@ namespace sdr
             }
             else
             {
-                const sal_Int32 nNewStart(static_cast<const SdrCircStartAngleItem&>(rItemSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue());
-                const sal_Int32 nNewEnd(static_cast<const SdrCircEndAngleItem&>(rItemSet.Get(SDRATTR_CIRCENDANGLE)).GetValue());
+                const sal_Int32 nNewStart(static_cast<const SdrAngleItem&>(rItemSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue());
+                const sal_Int32 nNewEnd(static_cast<const SdrAngleItem&>(rItemSet.Get(SDRATTR_CIRCENDANGLE)).GetValue());
                 const double fStart(((36000 - nNewEnd) % 36000) * F_PI18000);
                 const double fEnd(((36000 - nNewStart) % 36000) * F_PI18000);
                 const bool bCloseSegment(OBJ_CARC != nIdentifier);
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index 701cce534c6c..eb9329177e5c 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -124,12 +124,12 @@ namespace sdr
 
                 if(rObj.GetStartWink())
                 {
-                    mpItemSet->Put(SdrCircStartAngleItem(rObj.GetStartWink()));
+                    mpItemSet->Put(makeSdrCircStartAngleItem(rObj.GetStartWink()));
                 }
 
                 if(rObj.GetEndWink() != 36000)
                 {
-                    mpItemSet->Put(SdrCircEndAngleItem(rObj.GetEndWink()));
+                    mpItemSet->Put(makeSdrCircEndAngleItem(rObj.GetEndWink()));
                 }
             }
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 2a5a4c521545..3b5a83a438c4 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -199,8 +199,8 @@ SdrItemPool::SdrItemPool(
     mppLocalPoolDefaults[SDRATTR_MEASURETEXTFIXEDANGLE   -SDRATTR_START]=new SdrMeasureTextFixedAngleItem();
     mppLocalPoolDefaults[SDRATTR_MEASUREDECIMALPLACES    -SDRATTR_START]=new SdrMeasureDecimalPlacesItem();
     mppLocalPoolDefaults[SDRATTR_CIRCKIND      -SDRATTR_START]=new SdrCircKindItem;
-    mppLocalPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrCircStartAngleItem;
-    mppLocalPoolDefaults[SDRATTR_CIRCENDANGLE  -SDRATTR_START]=new SdrCircEndAngleItem;
+    mppLocalPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new SdrAngleItem(SDRATTR_CIRCSTARTANGLE, 0);
+    mppLocalPoolDefaults[SDRATTR_CIRCENDANGLE  -SDRATTR_START]=new SdrAngleItem(SDRATTR_CIRCENDANGLE, 36000);
     mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, false);
     mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, false);
     mppLocalPoolDefaults[SDRATTR_OBJPRINTABLE   -SDRATTR_START]=new SdrObjPrintableItem;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 987f1ab6e16d..19b379282ee9 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1084,8 +1084,8 @@ void SdrCircObj::ImpSetAttrToCircInfo()
     else if(eNewKindA == SDRCIRC_CUT)
         eNewKind = OBJ_CCUT;
 
-    sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
-    sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
+    sal_Int32 nNewStart = ((SdrAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
+    sal_Int32 nNewEnd = ((SdrAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
 
     bool bKindChg = meCircleKind != eNewKind;
     bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
@@ -1117,8 +1117,8 @@ void SdrCircObj::ImpSetCircInfoToAttr()
         eNewKindA = SDRCIRC_CUT;
 
     SdrCircKind eOldKindA = ((SdrCircKindItem&)rSet.Get(SDRATTR_CIRCKIND)).GetValue();
-    sal_Int32 nOldStartWink = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
-    sal_Int32 nOldEndWink = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
+    sal_Int32 nOldStartWink = ((SdrAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
+    sal_Int32 nOldEndWink = ((SdrAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
 
     if(eNewKindA != eOldKindA || nStartWink != nOldStartWink || nEndWink != nOldEndWink)
     {
@@ -1131,12 +1131,12 @@ void SdrCircObj::ImpSetCircInfoToAttr()
 
         if(nStartWink != nOldStartWink)
         {
-            GetProperties().SetObjectItemDirect(SdrCircStartAngleItem(nStartWink));
+            GetProperties().SetObjectItemDirect(makeSdrCircStartAngleItem(nStartWink));
         }
 
         if(nEndWink != nOldEndWink)
         {
-            GetProperties().SetObjectItemDirect(SdrCircEndAngleItem(nEndWink));
+            GetProperties().SetObjectItemDirect(makeSdrCircEndAngleItem(nEndWink));
         }
 
         SetXPolyDirty();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b894bf5e8b7b..594c86ee4a9c 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1971,7 +1971,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
         const SfxPoolItem* pPoolItem=NULL;
         if(aSet.GetItemState(SDRATTR_CIRCSTARTANGLE,false,&pPoolItem)==SfxItemState::SET)
         {
-            sal_Int32 nAngle = ((SdrCircStartAngleItem*)pPoolItem)->GetValue();
+            sal_Int32 nAngle = ((SdrAngleItem*)pPoolItem)->GetValue();
             aAny <<= nAngle;
         }
         break;
@@ -1982,7 +1982,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
         const SfxPoolItem* pPoolItem=NULL;
         if (aSet.GetItemState(SDRATTR_CIRCENDANGLE,false,&pPoolItem)==SfxItemState::SET)
         {
-            sal_Int32 nAngle = ((SdrCircEndAngleItem*)pPoolItem)->GetValue();
+            sal_Int32 nAngle = ((SdrAngleItem*)pPoolItem)->GetValue();
             aAny <<= nAngle;
         }
         break;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 4505d3a4b9c0..854c1f722942 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2658,8 +2658,8 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const
         if(pObj->ISA(SdrCircObj))
         {
             SfxItemSet aAttr(pDrawModel->GetItemPool());
-            aAttr.Put(SdrCircStartAngleItem(9000));
-            aAttr.Put(SdrCircEndAngleItem(0));
+            aAttr.Put(makeSdrCircStartAngleItem(9000));
+            aAttr.Put(makeSdrCircEndAngleItem(0));
             pObj->SetMergedItemSet(aAttr);
         }
         else if(pObj->ISA(SdrPathObj))