summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-04 13:26:35 +0200
committerNoel Grandin <noel@peralex.com>2014-11-04 14:45:57 +0200
commit8d85e50bec177d5db19ab9247c84a1cb6e272f1a (patch)
tree0fd7ff98cc1b9d3ea89967e46ae189c7c3fb0f9a /svx/source/svdraw
parentf18fd73e287b781e953a3c4bfa05b55f39880a35 (diff)
rename nWink0->nAngle0
Change-Id: I19a2c367064f6b6f2656ec645d1a79144b479df9
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svddrgm1.hxx4
-rw-r--r--svx/source/svdraw/svddrgmt.cxx12
-rw-r--r--svx/source/svdraw/svdocirc.cxx6
3 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 972c17de91ac..46f99abf1cb7 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -53,7 +53,7 @@ class SdrDragRotate : public SdrDragMethod
private:
double nSin;
double nCos;
- long nWink0;
+ long nAngle0;
long nWink;
bool bRight;
@@ -75,7 +75,7 @@ class SdrDragShear : public SdrDragMethod
{
private:
Fraction aFact;
- long nWink0;
+ long nAngle0;
long nWink;
double nTan;
bool bVertical; // contort vertically
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 0018d4a8a1eb..706f9f9b1836 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -2115,7 +2115,7 @@ SdrDragRotate::SdrDragRotate(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
nSin(0.0),
nCos(1.0),
- nWink0(0),
+ nAngle0(0),
nWink(0),
bRight(false)
{
@@ -2148,7 +2148,7 @@ bool SdrDragRotate::BeginSdrDrag()
{
Show();
DragStat().Ref1()=pH->GetPos();
- nWink0=GetAngle(DragStat().GetStart()-DragStat().GetRef1());
+ nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1());
return true;
}
else
@@ -2170,7 +2170,7 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
Point aPnt(rPnt_);
if (DragStat().CheckMinMoved(aPnt))
{
- long nNewAngle=NormAngle360(GetAngle(aPnt-DragStat().GetRef1())-nWink0);
+ long nNewAngle=NormAngle360(GetAngle(aPnt-DragStat().GetRef1())-nAngle0);
long nSA=0;
if (getSdrDragView().IsAngleSnapEnabled())
@@ -2246,7 +2246,7 @@ TYPEINIT1(SdrDragShear,SdrDragMethod);
SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1)
: SdrDragMethod(rNewView),
aFact(1,1),
- nWink0(0),
+ nAngle0(0),
nWink(0),
nTan(0.0),
bVertical(false),
@@ -2296,7 +2296,7 @@ bool SdrDragShear::BeginSdrDrag()
if (pRefHdl!=NULL)
{
DragStat().Ref1()=pRefHdl->GetPos();
- nWink0=GetAngle(DragStat().GetStart()-DragStat().GetRef1());
+ nAngle0=GetAngle(DragStat().GetStart()-DragStat().GetRef1());
}
else
{
@@ -2365,7 +2365,7 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
if (bSlant)
{
- nNewAngle=NormAngle180(-(GetAngle(aDif)-nWink0));
+ nNewAngle=NormAngle180(-(GetAngle(aDif)-nAngle0));
if (bVertical)
nNewAngle=NormAngle180(-nNewAngle);
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 4b1e1632ded0..f927e1a923c4 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -813,7 +813,7 @@ void SdrCircObj::NbcMove(const Size& aSiz)
void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- long nWink0=aGeo.nRotationAngle;
+ long nAngle0=aGeo.nRotationAngle;
bool bNoShearRota=(aGeo.nRotationAngle==0 && aGeo.nShearAngle==0);
SdrTextObj::NbcResize(rRef,xFact,yFact);
bNoShearRota|=(aGeo.nRotationAngle==0 && aGeo.nShearAngle==0);
@@ -836,8 +836,8 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
}
} else { // mirror contorted ellipses
if (bXMirr!=bYMirr) {
- nS0+=nWink0;
- nE0+=nWink0;
+ nS0+=nAngle0;
+ nE0+=nAngle0;
if (bXMirr) {
long nTmp=nS0;
nS0=18000-nE0;