diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sdr/properties/circleproperties.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdattr.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdocirc.cxx | 12 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshape.cxx | 4 |
5 files changed, 14 insertions, 14 deletions
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; |