diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-04 13:21:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-04 14:45:56 +0200 |
| commit | ddd549c7873404d0c09aca676a13660404b0bcd2 (patch) | |
| tree | 974e7c0c438bec4c6d91a27130d02858215e2c3c /svx/source | |
| parent | 8e7db605e34380950a33b67b112424fbccedad5a (diff) | |
rename nTmpWink->nTmpAngle
Change-Id: Ie6b3af93633f17e8aaa90252348488b67446f6ee
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 20 | ||||
| -rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index b32bbd524b9c..39e2c35191ab 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2125,15 +2125,15 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const { ImpTakeDescriptionStr(STR_DragMethRotate, rStr); rStr += " ("; - sal_Int32 nTmpWink(NormAngle360(nWink)); + sal_Int32 nTmpAngle(NormAngle360(nWink)); if(bRight && nWink) { - nTmpWink -= 36000; + nTmpAngle -= 36000; } OUString aStr; - getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); + getSdrDragView().GetModel()->TakeWinkStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2261,15 +2261,15 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const ImpTakeDescriptionStr(STR_DragMethShear, rStr); rStr += " ("; - sal_Int32 nTmpWink(nWink); + sal_Int32 nTmpAngle(nWink); if(bUpSideDown) - nTmpWink += 18000; + nTmpAngle += 18000; - nTmpWink = NormAngle180(nTmpWink); + nTmpAngle = NormAngle180(nTmpAngle); OUString aStr; - getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); + getSdrDragView().GetModel()->TakeWinkStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2416,11 +2416,11 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt) if (bSlant) { // calculate resize for slant // when angle snapping is activated, disable 89 degree limit - long nTmpWink=nNewAngle; + long nTmpAngle=nNewAngle; if (bUpSideDown) nNewAngle-=18000; - if (bNeg) nTmpWink=-nTmpWink; + if (bNeg) nTmpAngle=-nTmpAngle; bResize=true; - double nCos=cos(nTmpWink*nPi180); + double nCos=cos(nTmpAngle*nPi180); aNeuFact=nCos; Kuerzen(aFact,10); // three decimals should be enough } diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 868386006a22..eb5e6a52f5a0 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -464,8 +464,8 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.bAutoUpsideDown=false; if (rRec.bTextAutoAngle) { - long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView); - if (nTmpWink>=18000) { + long nTmpAngle=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView); + if (nTmpAngle>=18000) { rPol.nTextWink+=18000; rPol.bAutoUpsideDown=true; } |