From 1bbd5a1f907f6ee86f060c3c4bcd0a4ab25e5aa0 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 20 Nov 2017 15:04:48 +0200 Subject: TypedWhichId for SDRATTR* constants (2) Change-Id: I9926d55568f8b5bbc67f448bbf7fb660e74505fd Reviewed-on: https://gerrit.libreoffice.org/44964 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/svdraw/svdomeas.cxx | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'svx/source/svdraw/svdomeas.cxx') diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 7fce613f2aad..2f6152df4d9b 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -84,11 +84,11 @@ OUString SdrMeasureObj::TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind FieldUnit eModUIUnit(FUNIT_NONE); const SfxItemSet& rSet = GetMergedItemSet(); - bTextRota90 = static_cast(rSet.Get(SDRATTR_MEASURETEXTROTA90)).GetValue(); - eMeasureUnit = static_cast(rSet.Get(SDRATTR_MEASUREUNIT)).GetValue(); - aMeasureScale = static_cast(rSet.Get(SDRATTR_MEASURESCALE)).GetValue(); - bShowUnit = static_cast(rSet.Get(SDRATTR_MEASURESHOWUNIT)).GetValue(); - sal_Int16 nNumDigits = static_cast(rSet.Get(SDRATTR_MEASUREDECIMALPLACES)).GetValue(); + bTextRota90 = rSet.Get(SDRATTR_MEASURETEXTROTA90).GetValue(); + eMeasureUnit = rSet.Get(SDRATTR_MEASUREUNIT).GetValue(); + aMeasureScale = rSet.Get(SDRATTR_MEASURESCALE).GetValue(); + bShowUnit = rSet.Get(SDRATTR_MEASURESHOWUNIT).GetValue(); + sal_Int16 nNumDigits = rSet.Get(SDRATTR_MEASUREDECIMALPLACES).GetValue(); switch(eMeasureFieldKind) { @@ -317,19 +317,19 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const rRec.aPt2 = aPt2; const SfxItemSet& rSet = GetObjectItemSet(); - rRec.eWantTextHPos =static_cast(rSet.Get(SDRATTR_MEASURETEXTHPOS )).GetValue(); - rRec.eWantTextVPos =static_cast(rSet.Get(SDRATTR_MEASURETEXTVPOS )).GetValue(); - rRec.nLineDist =static_cast(rSet.Get(SDRATTR_MEASURELINEDIST )).GetValue(); - rRec.nHelplineOverhang =static_cast(rSet.Get(SDRATTR_MEASUREHELPLINEOVERHANG)).GetValue(); - rRec.nHelplineDist =static_cast(rSet.Get(SDRATTR_MEASUREHELPLINEDIST )).GetValue(); - rRec.nHelpline1Len =static_cast(rSet.Get(SDRATTR_MEASUREHELPLINE1LEN )).GetValue(); - rRec.nHelpline2Len =static_cast(rSet.Get(SDRATTR_MEASUREHELPLINE2LEN )).GetValue(); - rRec.bBelowRefEdge =static_cast(rSet.Get(SDRATTR_MEASUREBELOWREFEDGE )).GetValue(); - rRec.bTextRota90 =static_cast(rSet.Get(SDRATTR_MEASURETEXTROTA90 )).GetValue(); + rRec.eWantTextHPos =rSet.Get(SDRATTR_MEASURETEXTHPOS ).GetValue(); + rRec.eWantTextVPos =rSet.Get(SDRATTR_MEASURETEXTVPOS ).GetValue(); + rRec.nLineDist =rSet.Get(SDRATTR_MEASURELINEDIST ).GetValue(); + rRec.nHelplineOverhang =rSet.Get(SDRATTR_MEASUREHELPLINEOVERHANG).GetValue(); + rRec.nHelplineDist =rSet.Get(SDRATTR_MEASUREHELPLINEDIST ).GetValue(); + rRec.nHelpline1Len =rSet.Get(SDRATTR_MEASUREHELPLINE1LEN ).GetValue(); + rRec.nHelpline2Len =rSet.Get(SDRATTR_MEASUREHELPLINE2LEN ).GetValue(); + rRec.bBelowRefEdge =rSet.Get(SDRATTR_MEASUREBELOWREFEDGE ).GetValue(); + rRec.bTextRota90 =rSet.Get(SDRATTR_MEASURETEXTROTA90 ).GetValue(); rRec.bTextUpsideDown =static_cast(rSet.Get(SDRATTR_MEASURETEXTUPSIDEDOWN )).GetValue(); - rRec.aMeasureScale =static_cast(rSet.Get(SDRATTR_MEASURESCALE )).GetValue(); - rRec.aFormatString =static_cast(rSet.Get(SDRATTR_MEASUREFORMATSTRING )).GetValue(); - rRec.bTextAutoAngle =static_cast(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLE )).GetValue(); + rRec.aMeasureScale =rSet.Get(SDRATTR_MEASURESCALE ).GetValue(); + rRec.aFormatString =rSet.Get(SDRATTR_MEASUREFORMATSTRING ).GetValue(); + rRec.bTextAutoAngle =rSet.Get(SDRATTR_MEASURETEXTAUTOANGLE ).GetValue(); rRec.nTextAutoAngleView=static_cast(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLEVIEW)).GetValue(); } -- cgit