[Libreoffice-commits] core.git: 16 commits - include/svx svx/source sw/inc sw/source vcl/source
Noel Grandin
noel at peralex.com
Tue Nov 4 04:46:52 PST 2014
include/svx/obj3d.hxx | 2
include/svx/scene3d.hxx | 4
include/svx/svdedtv.hxx | 10 -
include/svx/svdglev.hxx | 4
include/svx/svdglue.hxx | 16 +-
include/svx/svdhdl.hxx | 2
include/svx/svdmodel.hxx | 2
include/svx/svdoashp.hxx | 8 -
include/svx/svdobj.hxx | 14 +-
include/svx/svdocirc.hxx | 22 +--
include/svx/svdoedge.hxx | 4
include/svx/svdograf.hxx | 4
include/svx/svdogrp.hxx | 8 -
include/svx/svdomeas.hxx | 4
include/svx/svdopath.hxx | 2
include/svx/svdorect.hxx | 4
include/svx/svdotext.hxx | 4
include/svx/svdovirt.hxx | 8 -
include/svx/svdpoev.hxx | 2
include/svx/svdsnpv.hxx | 4
include/svx/svdtrans.hxx | 18 +-
svx/source/engine3d/obj3d.cxx | 6
svx/source/engine3d/scene3d.cxx | 10 -
svx/source/sdr/properties/circleproperties.cxx | 8 -
svx/source/svdraw/svddrgm1.hxx | 12 -
svx/source/svdraw/svddrgmt.cxx | 166 ++++++++++++------------
svx/source/svdraw/svdedtv1.cxx | 52 +++----
svx/source/svdraw/svdfmtf.cxx | 10 -
svx/source/svdraw/svdglev.cxx | 8 -
svx/source/svdraw/svdglue.cxx | 74 +++++-----
svx/source/svdraw/svdhdl.cxx | 34 ++---
svx/source/svdraw/svdmodel.cxx | 8 -
svx/source/svdraw/svdoashp.cxx | 34 ++---
svx/source/svdraw/svdobj.cxx | 32 ++--
svx/source/svdraw/svdocirc.cxx | 170 ++++++++++++-------------
svx/source/svdraw/svdoedge.cxx | 8 -
svx/source/svdraw/svdograf.cxx | 8 -
svx/source/svdraw/svdogrp.cxx | 32 ++--
svx/source/svdraw/svdomeas.cxx | 52 +++----
svx/source/svdraw/svdopath.cxx | 74 +++++-----
svx/source/svdraw/svdorect.cxx | 12 -
svx/source/svdraw/svdotxdr.cxx | 2
svx/source/svdraw/svdotxtr.cxx | 12 -
svx/source/svdraw/svdovirt.cxx | 20 +-
svx/source/svdraw/svdpoev.cxx | 8 -
svx/source/svdraw/svdtrans.cxx | 32 ++--
sw/inc/dcontact.hxx | 8 -
sw/source/core/draw/dcontact.cxx | 20 +-
vcl/source/filter/sgvmain.cxx | 40 ++---
vcl/source/filter/sgvmain.hxx | 16 +-
vcl/source/filter/sgvtext.cxx | 14 +-
51 files changed, 564 insertions(+), 564 deletions(-)
New commits:
commit a3e2b884f33435eef369ce8cb8eee4bdc5db95af
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 4 14:45:00 2014 +0200
rename nWink->nAngle
Change-Id: I3a4cec65307c517684d4f8a291ca73b6a212a857
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index ac7e524..bdba2c3 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -178,7 +178,7 @@ public:
// which is vertical to the screen, plus a shift of the scene.
// This means that also the scene (E3dScene) must define this
// routine as virtual in its class.
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
// get wireframe polygon for local object. No transform is applied.
basegfx::B3DPolyPolygon CreateWireframe() const;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 332fa2a..aa24245 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -210,8 +210,8 @@ public:
virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE;
virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
- void RotateScene(const Point& rRef, long nWink, double sn, double cs);
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
+ void RotateScene(const Point& rRef, long nAngle, double sn, double cs);
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const SAL_OVERRIDE;
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 13f1159..e29a065 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -215,12 +215,12 @@ public:
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
long GetMarkedObjRotate() const;
- void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
+ void RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
void MirrorMarkedObjHorizontal(bool bCopy=false);
void MirrorMarkedObjVertical(bool bCopy=false);
long GetMarkedObjShear() const;
- void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
+ void ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false);
void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
void DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false);
@@ -230,12 +230,12 @@ public:
void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); }
void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
- void RotateAllMarked(const Point& rRef, long nWink, bool bCopy=false) { RotateMarkedObj(rRef,nWink,bCopy); }
+ void RotateAllMarked(const Point& rRef, long nAngle, bool bCopy=false) { RotateMarkedObj(rRef,nAngle,bCopy); }
void MirrorAllMarked(const Point& rRef1, const Point& rRef2, bool bCopy=false) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
void MirrorAllMarkedHorizontal(bool bCopy=false) { MirrorMarkedObjHorizontal(bCopy); }
void MirrorAllMarkedVertical(bool bCopy=false) { MirrorMarkedObjVertical(bCopy); }
long GetAllMarkedShear() const { return GetMarkedObjShear(); }
- void ShearAllMarked(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
+ void ShearAllMarked(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false) { ShearMarkedObj(rRef,nAngle,bVShear,bCopy); }
void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
void CopyMarked() { CopyMarkedObj(); }
bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 564831d..cc1022c 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -79,11 +79,11 @@ public:
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
- void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
+ void RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy=false);
void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, bool bCopy=false);
void MirrorMarkedGluePointsHorizontal(bool bCopy=false);
void MirrorMarkedGluePointsVertical(bool bCopy=false);
- void ShearMarkedGluePoints(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
+ void ShearMarkedGluePoints(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false);
void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false);
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 165a7f8..9b7f215 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -96,12 +96,12 @@ public:
Point GetAbsolutePos(const SdrObject& rObj) const;
void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
long GetAlignAngle() const;
- void SetAlignAngle(long nWink);
+ void SetAlignAngle(long nAngle);
long EscDirToAngle(sal_uInt16 nEsc) const;
- sal_uInt16 EscAngleToDir(long nWink) const;
- void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
- void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj);
+ sal_uInt16 EscAngleToDir(long nAngle) const;
+ void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj);
+ void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj);
};
#define SDRGLUEPOINT_NOTFOUND 0xFFFF
@@ -133,10 +133,10 @@ public:
void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const;
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
- void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
+ void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
- void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj);
+ void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj);
};
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index efb5403..f51b6b5 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -401,7 +401,7 @@ public:
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
- void TakeAngleStr(long nWink, OUString& rStr, bool bNoDegChar = false) const;
+ void TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar = false) const;
void TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar = false) const;
// RecalcPageNums is ordinarily only called by the Page.
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 169dd13..513813d 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -189,15 +189,15 @@ public:
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
- virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
@@ -253,7 +253,7 @@ public:
virtual void SaveGeoData(SdrObjGeoData &rGeo) const SAL_OVERRIDE;
virtual void RestGeoData(const SdrObjGeoData &rGeo) SAL_OVERRIDE;
- // need to take fObjectRotation instead of aGeo.nWink, replace it temporary
+ // need to take fObjectRotation instead of aGeo.nAngle, replace it temporary
virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE;
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 4f9c1ac..3ae4f23 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -422,7 +422,7 @@ protected:
void ImpForcePlusData();
- OUString GetAngleStr(long nWink, bool bNoDegChar = false) const;
+ OUString GetAngleStr(long nAngle, bool bNoDegChar = false) const;
OUString GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const;
// bNotMyself=true means: set only ObjList to dirty, don't mark this object as dirty.
@@ -673,15 +673,15 @@ public:
// Nbc bedeutet: 'NoBroadcast'.
virtual void NbcMove (const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
+ virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear);
virtual void Move (const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true);
- virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
+ virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
- virtual void Shear (const Point& rRef, long nWink, double tn, bool bVShear);
+ virtual void Shear (const Point& rRef, long nAngle, double tn, bool bVShear);
// Die relative Position eines Zeichenobjektes ist die Entfernung der
// linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect)
@@ -831,9 +831,9 @@ public:
// to be set temporarily when transforming related object(?)
void SetGlueReallyAbsolute(bool bOn);
- void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs);
+ void NbcRotateGluePoints(const Point& rRef, long nAngle, double sn, double cs);
void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2);
- void NbcShearGluePoints (const Point& rRef, long nWink, double tn, bool bVShear);
+ void NbcShearGluePoints (const Point& rRef, long nAngle, double tn, bool bVShear);
// is object an edge?
virtual bool IsEdge() const;
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 14e8f46..169ef35 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -114,7 +114,7 @@ public:
virtual void NbcMove(const Size& aSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE;
protected:
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 438c5e7..04351a0 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -267,9 +267,9 @@ public:
virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) SAL_OVERRIDE;
// #i54102# added rotate, mirrorn and shear support
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
// #102344# Added missing implementation
virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index e600609..cd47a207 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -163,9 +163,9 @@ public:
virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE;
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 4a89e8f..c209532 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -86,9 +86,9 @@ public:
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
- virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void SetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
virtual void SetRelativePos(const Point& rPnt) SAL_OVERRIDE;
virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
@@ -96,9 +96,9 @@ public:
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
virtual void NbcSetRelativePos(const Point& rPnt) SAL_OVERRIDE;
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 5cea5fe..4c6dbb3 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -118,9 +118,9 @@ public:
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual long GetRotateAngle() const SAL_OVERRIDE;
virtual void RecalcSnapRect() SAL_OVERRIDE;
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index afd1d57..ef88cd2 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -106,9 +106,9 @@ public:
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual bool DoMacro(const SdrObjMacroHitRec& rRec) SAL_OVERRIDE;
virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 40cbacd..b700255 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -469,9 +469,9 @@ public:
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual bool HasTextEdit() const SAL_OVERRIDE;
virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE;
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 766b807..36cc430 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -102,15 +102,15 @@ public:
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
- virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void RecalcSnapRect() SAL_OVERRIDE;
virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE;
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index ef73aa4..e7a47c6 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -65,7 +65,7 @@ public:
void MoveMarkedPoints(const Size& rSiz);
void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- void RotateMarkedPoints(const Point& rRef, long nWink);
+ void RotateMarkedPoints(const Point& rRef, long nAngle);
// Hierbei entstehen eventuell beliebig viele neue Objekte:
void RipUpAtMarkedPoints() SAL_OVERRIDE;
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 815656a..93dff24 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -187,7 +187,7 @@ public:
// Der Winkelfang ist unabhaengig vom Koordinatenfang
// und somit von der Einstellung IsSnapEnabled()
// Es sollten nur Werte angegeben werden fuer die gilt:
- // 36000 modulu nWink = 0
+ // 36000 modulu nAngle = 0
// Implementiert fuer:
// - Rotate (Dragging)
// - Shear (Dragging)
@@ -195,7 +195,7 @@ public:
// Persistent.
void SetAngleSnapEnabled(bool bOn) { bAngleSnapEnab=bOn; }
bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
- void SetSnapAngle(long nWink) { nSnapAngle=nWink; }
+ void SetSnapAngle(long nAngle) { nSnapAngle=nAngle; }
long GetSnapAngle() const { return nSnapAngle; }
// Ortho hat je nach Kontext verschiedene Effekte:
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index e79bbb8..0dca975 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -31,12 +31,12 @@
// Winkelangaben der DrawingEngine sind 1/100 Degree
-// #i19054# nowhere used, removed // const int nWinkDiv=100;
+// #i19054# nowhere used, removed // const int nAngleDiv=100;
// Um Winkel der DrawingEngine mit den Trigonometrischen Funktionen
// verarbeiten zu koennen, muessen sie zunaest ins Bogenmass umgerechnet
// werden. Dies gestaltet sich recht einfach mit der folgenden Konstanten
-// nPi180. Sei nWink ein Winkel in 1/100 Deg so schreibt man z.B.:
-// double nSin=sin(nWink*nPi180);
+// nPi180. Sei nAngle ein Winkel in 1/100 Deg so schreibt man z.B.:
+// double nSin=sin(nAngle*nPi180);
// Rueckwandlung entsprechend durch Teilen.
const double nPi=3.14159265358979323846;
const double nPi180=0.000174532925199432957692222; // Bei zuweing Stellen ist tan(4500*nPi180)!=1.0
@@ -79,7 +79,7 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = fa
inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical);
// Die folgenden Methoden behandeln einen Punkt eines XPolygons, wobei die
// benachbarten Kontrollpunkte des eigentlichen Punktes ggf. in pC1/pC2
-// uebergeben werden. Ueber rSin/rCos wird gleichzeitig sin(nWink) und cos(nWink)
+// uebergeben werden. Ueber rSin/rCos wird gleichzeitig sin(nAngle) und cos(nAngle)
// zurueckgegeben.
// Der Rueckgabewinkel ist hier ebenfalls in Rad.
double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
@@ -133,17 +133,17 @@ inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear)
inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad, bool bVertical)
{
- double nWink;
+ double nAngle;
if (bVertical) {
long dy=rPnt.Y()-rCenter.Y();
- nWink=(double)dy/(double)rRad.Y();
+ nAngle=(double)dy/(double)rRad.Y();
rPnt.Y()=rCenter.Y();
} else {
long dx=rCenter.X()-rPnt.X();
- nWink=(double)dx/(double)rRad.X();
+ nAngle=(double)dx/(double)rRad.X();
rPnt.X()=rCenter.X();
}
- return nWink;
+ return nAngle;
}
/**************************************************************************************************/
@@ -157,7 +157,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
SVX_DLLPUBLIC long GetAngle(const Point& rPnt);
long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99
SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf 0.00..359.99
-sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen
+sal_uInt16 GetAngleSector(long nAngle); // Sektor im kartesischen Koordinatensystem bestimmen
// Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2
// Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert.
long GetLen(const Point& rPnt);
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 831b7c2..9e86153 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -738,21 +738,21 @@ void E3dObject::RestGeoData(const SdrObjGeoData& rGeo)
// happened is a rotation around the axis perpendicular to the screen and that
// is regardless of how the scene has been rotated up until now.
-void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void E3dObject::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
// So currently the glue points are defined relative to the scene aOutRect.
// Before turning the glue points are defined relative to the page. They
// take no part in the rotation of the scene. To ensure this, there is the
// SetGlueReallyAbsolute(sal_True);
- double fWinkelInRad = nWink/100.0 * F_PI180;
+ double fWinkelInRad = nAngle/100.0 * F_PI180;
basegfx::B3DHomMatrix aRotateZ;
aRotateZ.rotate(0.0, 0.0, fWinkelInRad);
NbcSetTransform(aRotateZ * GetTransform());
SetRectsDirty(); // This forces a recalculation of all BoundRects
- NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still
+ NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 9d5336f..71eda45 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -534,7 +534,7 @@ void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint &rHint)
E3dObject::Notify(rBC, rHint);
}
-void E3dScene::RotateScene (const Point& rRef, long /*nWink*/, double sn, double cs)
+void E3dScene::RotateScene (const Point& rRef, long /*nAngle*/, double sn, double cs)
{
Point UpperLeft, LowerRight, Center, NewCenter;
@@ -623,7 +623,7 @@ void E3dScene::SetTransform(const basegfx::B3DHomMatrix& rMatrix)
}
}
-void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void E3dScene::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
// So currently the glue points are defined relative to the scene aOutRect.
// Before turning the glue points are defined relative to the page. They
@@ -636,15 +636,15 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
// objects. So going through the entire list and rotate around the Z axis
// through the enter of aOutRect's (Steiner's theorem), so RotateZ
- RotateScene (rRef, nWink, sn, cs); // Rotates the scene
- double fWinkelInRad = nWink/100.0 * F_PI180;
+ RotateScene (rRef, nAngle, sn, cs); // Rotates the scene
+ double fWinkelInRad = nAngle/100.0 * F_PI180;
basegfx::B3DHomMatrix aRotation;
aRotation.rotate(0.0, 0.0, fWinkelInRad);
NbcSetTransform(aRotation * GetTransform());
SetRectsDirty(); // This forces a recalculation of all BoundRects
- NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still
+ NbcRotateGluePoints(rRef,nAngle,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 46f99ab..4845fba 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -54,7 +54,7 @@ private:
double nSin;
double nCos;
long nAngle0;
- long nWink;
+ long nAngle;
bool bRight;
public:
@@ -76,7 +76,7 @@ class SdrDragShear : public SdrDragMethod
private:
Fraction aFact;
long nAngle0;
- long nWink;
+ long nAngle;
double nTan;
bool bVertical; // contort vertically
bool bResize; // shear and resize
@@ -101,7 +101,7 @@ class SdrDragMirror : public SdrDragMethod
{
private:
Point aDif;
- long nWink;
+ long nAngle;
bool bMirrored;
bool bSide0;
@@ -167,7 +167,7 @@ private:
bool bUpr;
bool bLwr;
bool bAtCenter;
- long nWink;
+ long nAngle;
long nMarkSize;
SdrCrookMode eMode;
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 6a814d2..920df9f 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1086,13 +1086,13 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
if (pH!=NULL)
{
Point aRef(pH->GetPos());
- long nWink=NormAngle360(GetAngle(aPnt-aRef));
- long nNewAngle=nWink;
+ long nAngle=NormAngle360(GetAngle(aPnt-aRef));
+ long nNewAngle=nAngle;
nNewAngle+=nSA/2;
nNewAngle/=nSA;
nNewAngle*=nSA;
nNewAngle=NormAngle360(nNewAngle);
- double a=(nNewAngle-nWink)*nPi180;
+ double a=(nNewAngle-nAngle)*nPi180;
double nSin=sin(a);
double nCos=cos(a);
RotatePoint(aPnt,aRef,nSin,nCos);
@@ -2108,7 +2108,7 @@ TYPEINIT1(SdrDragRotate,SdrDragMethod);
void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
{
- rTarget.Rotate(DragStat().GetRef1(), nWink, sin(nWink*nPi180), cos(nWink*nPi180));
+ rTarget.Rotate(DragStat().GetRef1(), nAngle, sin(nAngle*nPi180), cos(nAngle*nPi180));
}
SdrDragRotate::SdrDragRotate(SdrDragView& rNewView)
@@ -2116,7 +2116,7 @@ SdrDragRotate::SdrDragRotate(SdrDragView& rNewView)
nSin(0.0),
nCos(1.0),
nAngle0(0),
- nWink(0),
+ nAngle(0),
bRight(false)
{
}
@@ -2125,9 +2125,9 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
rStr += " (";
- sal_Int32 nTmpAngle(NormAngle360(nWink));
+ sal_Int32 nTmpAngle(NormAngle360(nAngle));
- if(bRight && nWink)
+ if(bRight && nAngle)
{
nTmpAngle -= 36000;
}
@@ -2188,9 +2188,9 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
nNewAngle=NormAngle180(nNewAngle);
- if (nWink!=nNewAngle)
+ if (nAngle!=nNewAngle)
{
- sal_uInt16 nSekt0=GetAngleSector(nWink);
+ sal_uInt16 nSekt0=GetAngleSector(nAngle);
sal_uInt16 nSekt1=GetAngleSector(nNewAngle);
if (nSekt0==0 && nSekt1==3)
@@ -2199,8 +2199,8 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
if (nSekt0==3 && nSekt1==0)
bRight=false;
- nWink=nNewAngle;
- double a=nWink*nPi180;
+ nAngle=nNewAngle;
+ double a=nAngle*nPi180;
double nSin1=sin(a); // calculate now, so as little time as possible
double nCos1=cos(a); // passes between Hide() and Show()
Hide();
@@ -2216,19 +2216,19 @@ bool SdrDragRotate::EndSdrDrag(bool bCopy)
{
Hide();
- if (nWink!=0)
+ if (nAngle!=0)
{
if (IsDraggingPoints())
{
- getSdrDragView().RotateMarkedPoints(DragStat().GetRef1(),nWink);
+ getSdrDragView().RotateMarkedPoints(DragStat().GetRef1(),nAngle);
}
else if (IsDraggingGluePoints())
{
- getSdrDragView().RotateMarkedGluePoints(DragStat().GetRef1(),nWink,bCopy);
+ getSdrDragView().RotateMarkedGluePoints(DragStat().GetRef1(),nAngle,bCopy);
}
else
{
- getSdrDragView().RotateMarkedObj(DragStat().GetRef1(),nWink,bCopy);
+ getSdrDragView().RotateMarkedObj(DragStat().GetRef1(),nAngle,bCopy);
}
}
return true;
@@ -2247,7 +2247,7 @@ SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1)
: SdrDragMethod(rNewView),
aFact(1,1),
nAngle0(0),
- nWink(0),
+ nAngle(0),
nTan(0.0),
bVertical(false),
bResize(false),
@@ -2261,7 +2261,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const
ImpTakeDescriptionStr(STR_DragMethShear, rStr);
rStr += " (";
- sal_Int32 nTmpAngle(nWink);
+ sal_Int32 nTmpAngle(nAngle);
if(bUpSideDown)
nTmpAngle += 18000;
@@ -2431,11 +2431,11 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
if (bNeg)
nNewAngle=-nNewAngle;
- if (nWink!=nNewAngle || aFact!=aNeuFact)
+ if (nAngle!=nNewAngle || aFact!=aNeuFact)
{
- nWink=nNewAngle;
+ nAngle=nNewAngle;
aFact=aNeuFact;
- double a=nWink*nPi180;
+ double a=nAngle*nPi180;
double nTan1=tan(a); // calculate now, so as little time as possible passes between Hide() and Show()
Hide();
nTan=nTan1;
@@ -2459,9 +2459,9 @@ void SdrDragShear::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
}
}
- if (nWink!=0)
+ if (nAngle!=0)
{
- rTarget.Shear(DragStat().GetRef1(),nWink,tan(nWink*nPi180),bVertical);
+ rTarget.Shear(DragStat().GetRef1(),nAngle,tan(nAngle*nPi180),bVertical);
}
}
@@ -2472,9 +2472,9 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
if (bResize && aFact==Fraction(1,1))
bResize=false;
- if (nWink!=0 || bResize)
+ if (nAngle!=0 || bResize)
{
- if (nWink!=0 && bResize)
+ if (nAngle!=0 && bResize)
{
OUString aStr;
ImpTakeDescriptionStr(STR_EditShear,aStr);
@@ -2499,12 +2499,12 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
bCopy=false;
}
- if (nWink!=0)
+ if (nAngle!=0)
{
- getSdrDragView().ShearMarkedObj(DragStat().GetRef1(),nWink,bVertical,bCopy);
+ getSdrDragView().ShearMarkedObj(DragStat().GetRef1(),nAngle,bVertical,bCopy);
}
- if (nWink!=0 && bResize)
+ if (nAngle!=0 && bResize)
getSdrDragView().EndUndo();
return true;
@@ -2535,7 +2535,7 @@ void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
SdrDragMirror::SdrDragMirror(SdrDragView& rNewView)
: SdrDragMethod(rNewView),
- nWink(0),
+ nAngle(0),
bMirrored(false),
bSide0(false)
{
@@ -2544,7 +2544,7 @@ SdrDragMirror::SdrDragMirror(SdrDragView& rNewView)
bool SdrDragMirror::ImpCheckSide(const Point& rPnt) const
{
long nAngle1=GetAngle(rPnt-DragStat().GetRef1());
- nAngle1-=nWink;
+ nAngle1-=nAngle;
nAngle1=NormAngle360(nAngle1);
return nAngle1<18000;
@@ -2579,7 +2579,7 @@ bool SdrDragMirror::BeginSdrDrag()
aDif=pH2->GetPos()-pH1->GetPos();
bool b90=(aDif.X()==0) || aDif.Y()==0;
bool b45=b90 || (std::abs(aDif.X()) == std::abs(aDif.Y()));
- nWink=NormAngle360(GetAngle(aDif));
+ nAngle=NormAngle360(GetAngle(aDif));
if (!getSdrDragView().IsMirrorAllowed(false,false) && !b45)
return false; // free choice of axis angle not allowed
@@ -2834,7 +2834,7 @@ SdrDragCrook::SdrDragCrook(SdrDragView& rNewView)
bUpr(false),
bLwr(false),
bAtCenter(false),
- nWink(0),
+ nAngle(0),
nMarkSize(0),
eMode(SDRCROOK_ROTATE)
{
@@ -2848,7 +2848,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
{
rStr += " (";
- sal_Int32 nVal(nWink);
+ sal_Int32 nVal(nAngle);
if(bAtCenter)
nVal *= 2;
@@ -3198,7 +3198,7 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
}
long nNeuRad=0;
- nWink=0;
+ nAngle=0;
if (bValid)
{
@@ -3255,18 +3255,18 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
nMul*=2;
aNeuFact=Fraction(nMul,nMarkSize);
- nWink=nPntWink;
+ nAngle=nPntWink;
}
else
{
- nWink=(long)((nMarkSize*360/nUmfang)*100)/2;
+ nAngle=(long)((nMarkSize*360/nUmfang)*100)/2;
- if (nWink==0)
+ if (nAngle==0)
bValid=false;
}
}
- if (nWink==0 || nNeuRad==0)
+ if (nAngle==0 || nNeuRad==0)
bValid=false;
if (!bValid)
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index d2ce026..1ba5f40 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -303,21 +303,21 @@ long SdrEditView::GetMarkedObjRotate() const
return nRetval;
//sal_Bool b1st=true;
//sal_Bool bOk=true;
- //long nWink=0;
+ //long nAngle=0;
//sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
//for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
// SdrMark* pM=GetSdrMarkByIndex(nm);
// SdrObject* pO=pM->GetMarkedSdrObj();
// long nAngle2=pO->GetRotateAngle();
- // if (b1st) nWink=nAngle2;
- // else if (nAngle2!=nWink) bOk=false;
+ // if (b1st) nAngle=nAngle2;
+ // else if (nAngle2!=nAngle) bOk=false;
// b1st=false;
//}
- //if (!bOk) nWink=0;
- //return nWink;
+ //if (!bOk) nAngle=0;
+ //return nAngle;
}
-void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy)
+void SdrEditView::RotateMarkedObj(const Point& rRef, long nAngle, bool bCopy)
{
const bool bUndo = IsUndoEnabled();
if( bUndo )
@@ -331,8 +331,8 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy)
if (bCopy)
CopyMarkedObj();
- double nSin=sin(nWink*nPi180);
- double nCos=cos(nWink*nPi180);
+ double nSin=sin(nAngle*nPi180);
+ double nCos=cos(nAngle*nPi180);
const size_t nMarkAnz(GetMarkedObjectCount());
if(nMarkAnz)
@@ -359,7 +359,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy)
aUpdaters.push_back(new E3DModifySceneSnapRectUpdater(pO));
}
- pO->Rotate(rRef,nWink,nSin,nCos);
+ pO->Rotate(rRef,nAngle,nSin,nCos);
}
// fire scene updaters
@@ -454,23 +454,23 @@ long SdrEditView::GetMarkedObjShear() const
{
bool b1st=true;
bool bOk=true;
- long nWink=0;
+ long nAngle=0;
const size_t nMarkAnz=GetMarkedObjectCount();
for (size_t nm=0; nm<nMarkAnz && bOk; ++nm) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
long nAngle2=pO->GetShearAngle();
- if (b1st) nWink=nAngle2;
- else if (nAngle2!=nWink) bOk=false;
+ if (b1st) nAngle=nAngle2;
+ else if (nAngle2!=nAngle) bOk=false;
b1st=false;
}
- if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR;
- if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR;
- if (!bOk) nWink=0;
- return nWink;
+ if (nAngle>SDRMAXSHEAR) nAngle=SDRMAXSHEAR;
+ if (nAngle<-SDRMAXSHEAR) nAngle=-SDRMAXSHEAR;
+ if (!bOk) nAngle=0;
+ return nAngle;
}
-void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bool bCopy)
+void SdrEditView::ShearMarkedObj(const Point& rRef, long nAngle, bool bVShear, bool bCopy)
{
const bool bUndo = IsUndoEnabled();
@@ -486,7 +486,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
if (bCopy)
CopyMarkedObj();
- double nTan=tan(nWink*nPi180);
+ double nTan=tan(nAngle*nPi180);
const size_t nMarkAnz=GetMarkedObjectCount();
for (size_t nm=0; nm<nMarkAnz; ++nm)
{
@@ -498,7 +498,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
AddUndoActions( vConnectorUndoActions );
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pO));
}
- pO->Shear(rRef,nWink,nTan,bVShear);
+ pO->Shear(rRef,nAngle,nTan,bVShear);
}
if( bUndo )
@@ -560,7 +560,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
Point aCtr1(aCtr0);
bool bRotOk(false);
double nSin(0.0), nCos(1.0);
- double nWink(0.0);
+ double nAngle(0.0);
if(0 != rRad.X() && 0 != rRad.Y())
{
@@ -568,16 +568,16 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
switch (eMode)
{
- case SDRCROOK_ROTATE : nWink=CrookRotateXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
- case SDRCROOK_SLANT : nWink=CrookSlantXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); break;
- case SDRCROOK_STRETCH: nWink=CrookStretchXPoint(aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
+ case SDRCROOK_ROTATE : nAngle=CrookRotateXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); bRotOk=bRotate; break;
+ case SDRCROOK_SLANT : nAngle=CrookSlantXPoint (aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical); break;
+ case SDRCROOK_STRETCH: nAngle=CrookStretchXPoint(aCtr1,NULL,NULL,rRef,rRad,nSin,nCos,bVertical,rMarkRect); break;
}
}
aCtr1 -= aCtr0;
if(bRotOk)
- pO->Rotate(aCtr0, Round(nWink/nPi180), nSin, nCos);
+ pO->Rotate(aCtr0, Round(nAngle/nPi180), nSin, nCos);
pO->Move(Size(aCtr1.X(),aCtr1.Y()));
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 4d42923..a457b22 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1040,14 +1040,14 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor()));
pText->SetMergedItemSet(aAttr);
}
- sal_uInt32 nWink = aFnt.GetOrientation();
- if ( nWink )
+ sal_uInt32 nAngle = aFnt.GetOrientation();
+ if ( nAngle )
{
- nWink*=10;
- double a=nWink*nPi180;
+ nAngle*=10;
+ double a=nAngle*nPi180;
double nSin=sin(a);
double nCos=cos(a);
- pText->NbcRotate(aPos,nWink,nSin,nCos);
+ pText->NbcRotate(aPos,nAngle,nSin,nCos);
}
InsertObj( pText, false );
}
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 107f5c6..03f94ab 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -400,16 +400,16 @@ static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void
RotatePoint(rPt,*(const Point*)p1,*(const double*)p3,*(const double*)p4);
}
-void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy)
+void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy)
{
ForceUndirtyMrkPnt();
OUString aStr(ImpGetResStr(STR_EditRotate));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_ROTATE);
if (bCopy) ImpCopyMarkedGluePoints();
- double nSin=sin(nWink*nPi180);
- double nCos=cos(nWink*nPi180);
- ImpTransformMarkedGluePoints(ImpRotate,&rRef,&nWink,&nSin,&nCos);
+ double nSin=sin(nAngle*nPi180);
+ double nCos=cos(nAngle*nPi180);
+ ImpTransformMarkedGluePoints(ImpRotate,&rRef,&nAngle,&nSin,&nCos);
EndUndo();
AdjustMarkHdl();
}
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 4473448..fe7acb1 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -136,17 +136,17 @@ long SdrGluePoint::GetAlignAngle() const
return 0;
}
-void SdrGluePoint::SetAlignAngle(long nWink)
+void SdrGluePoint::SetAlignAngle(long nAngle)
{
- nWink=NormAngle360(nWink);
- if (nWink>=33750 || nWink<2250) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_CENTER;
- else if (nWink< 6750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_TOP ;
- else if (nWink<11250) nAlign=SDRHORZALIGN_CENTER|SDRVERTALIGN_TOP ;
- else if (nWink<15750) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_TOP ;
- else if (nWink<20250) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_CENTER;
- else if (nWink<24750) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_BOTTOM;
- else if (nWink<29250) nAlign=SDRHORZALIGN_CENTER|SDRVERTALIGN_BOTTOM;
- else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM;
+ nAngle=NormAngle360(nAngle);
+ if (nAngle>=33750 || nAngle<2250) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_CENTER;
+ else if (nAngle< 6750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_TOP ;
+ else if (nAngle<11250) nAlign=SDRHORZALIGN_CENTER|SDRVERTALIGN_TOP ;
+ else if (nAngle<15750) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_TOP ;
+ else if (nAngle<20250) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_CENTER;
+ else if (nAngle<24750) nAlign=SDRHORZALIGN_LEFT |SDRVERTALIGN_BOTTOM;
+ else if (nAngle<29250) nAlign=SDRHORZALIGN_CENTER|SDRVERTALIGN_BOTTOM;
+ else if (nAngle<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM;
}
long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const
@@ -160,37 +160,37 @@ long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const
return 0;
}
-sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const
+sal_uInt16 SdrGluePoint::EscAngleToDir(long nAngle) const
{
- nWink=NormAngle360(nWink);
- if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT;
- if (nWink<13500) return SDRESC_TOP;
- if (nWink<22500) return SDRESC_LEFT;
- if (nWink<31500) return SDRESC_BOTTOM;
+ nAngle=NormAngle360(nAngle);
+ if (nAngle>=31500 || nAngle<4500) return SDRESC_RIGHT;
+ if (nAngle<13500) return SDRESC_TOP;
+ if (nAngle<22500) return SDRESC_LEFT;
+ if (nAngle<31500) return SDRESC_BOTTOM;
return 0;
}
-void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj)
+void SdrGluePoint::Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj)
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
RotatePoint(aPt,rRef,sn,cs);
// rotate reference edge
if(nAlign != (SDRHORZALIGN_CENTER|SDRVERTALIGN_CENTER))
{
- SetAlignAngle(GetAlignAngle()+nWink);
+ SetAlignAngle(GetAlignAngle()+nAngle);
}
// rotate exit directions
sal_uInt16 nEscDir0=nEscDir;
sal_uInt16 nEscDir1=0;
- if ((nEscDir0&SDRESC_LEFT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT )+nWink);
- if ((nEscDir0&SDRESC_TOP )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP )+nWink);
- if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink);
- if ((nEscDir0&SDRESC_BOTTOM)!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_BOTTOM)+nWink);
+ if ((nEscDir0&SDRESC_LEFT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT )+nAngle);
+ if ((nEscDir0&SDRESC_TOP )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP )+nAngle);
+ if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nAngle);
+ if ((nEscDir0&SDRESC_BOTTOM)!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_BOTTOM)+nAngle);
nEscDir=nEscDir1;
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
+void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj)
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
MirrorPoint(aPt,rRef1,rRef2);
@@ -198,7 +198,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
if(nAlign != (SDRHORZALIGN_CENTER|SDRVERTALIGN_CENTER))
{
long nAW=GetAlignAngle();
- nAW+=2*(nWink-nAW);
+ nAW+=2*(nAngle-nAW);
SetAlignAngle(nAW);
}
// mirror exit directions
@@ -206,29 +206,29 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
sal_uInt16 nEscDir1=0;
if ((nEscDir0&SDRESC_LEFT)!=0) {
long nEW=EscDirToAngle(SDRESC_LEFT);
- nEW+=2*(nWink-nEW);
+ nEW+=2*(nAngle-nEW);
nEscDir1|=EscAngleToDir(nEW);
}
if ((nEscDir0&SDRESC_TOP)!=0) {
long nEW=EscDirToAngle(SDRESC_TOP);
- nEW+=2*(nWink-nEW);
+ nEW+=2*(nAngle-nEW);
nEscDir1|=EscAngleToDir(nEW);
}
if ((nEscDir0&SDRESC_RIGHT)!=0) {
long nEW=EscDirToAngle(SDRESC_RIGHT);
- nEW+=2*(nWink-nEW);
+ nEW+=2*(nAngle-nEW);
nEscDir1|=EscAngleToDir(nEW);
}
if ((nEscDir0&SDRESC_BOTTOM)!=0) {
long nEW=EscDirToAngle(SDRESC_BOTTOM);
- nEW+=2*(nWink-nEW);
+ nEW+=2*(nAngle-nEW);
nEscDir1|=EscAngleToDir(nEW);
}
nEscDir=nEscDir1;
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVShear, const SdrObject* pObj)
+void SdrGluePoint::Shear(const Point& rRef, long /*nAngle*/, double tn, bool bVShear, const SdrObject* pObj)
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
ShearPoint(aPt,rRef,tn,bVShear);
@@ -362,34 +362,34 @@ void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj)
}
}
-void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj)
+void SdrGluePointList::Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj)
{
sal_uInt16 nAnz=GetCount();
for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
- GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj);
+ GetObject(nNum)->Rotate(rRef,nAngle,sn,cs,pObj);
}
}
void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj)
{
Point aPt(rRef2); aPt-=rRef1;
- long nWink=GetAngle(aPt);
- Mirror(rRef1,rRef2,nWink,pObj);
+ long nAngle=GetAngle(aPt);
+ Mirror(rRef1,rRef2,nAngle,pObj);
}
-void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
+void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj)
{
sal_uInt16 nAnz=GetCount();
for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
- GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj);
+ GetObject(nNum)->Mirror(rRef1,rRef2,nAngle,pObj);
}
}
-void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj)
+void SdrGluePointList::Shear(const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj)
{
sal_uInt16 nAnz=GetCount();
for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
- GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj);
+ GetObject(nNum)->Shear(rRef,nAngle,tn,bVShear,pObj);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 47d5ce1..03b092b 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1540,8 +1540,8 @@ bool ImpEdgeHdl::IsHorzDrag() const
}
else if (eEdgeKind==SDREDGE_THREELINES)
{
- long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
- if (nWink==0 || nWink==18000)
+ long nAngle=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
+ if (nAngle==0 || nAngle==18000)
return true;
else
return false;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index eef1be9..fe81f4f 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1302,15 +1302,15 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
rStr = aBuf.makeStringAndClear();
}
-void SdrModel::TakeAngleStr(long nWink, OUString& rStr, bool bNoDegChar) const
+void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const
{
- bool bNeg = nWink < 0;
+ bool bNeg = nAngle < 0;
if(bNeg)
- nWink = -nWink;
+ nAngle = -nAngle;
OUStringBuffer aBuf;
- aBuf.append(static_cast<sal_Int32>(nWink));
+ aBuf.append(static_cast<sal_Int32>(nAngle));
SvtSysLocale aSysLoc;
const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index c73a05b..3c4026f 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1616,7 +1616,7 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
}
InvalidateRenderGeometry();
}
-void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, double cs )
+void SdrObjCustomShape::NbcRotate( const Point& rRef, long nAngle, double sn, double cs )
{
bool bMirroredX = IsMirroredX();
bool bMirroredY = IsMirroredY();
@@ -1626,7 +1626,7 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou
fObjectRotation = 360 + fObjectRotation;
// the rotation angle for ashapes is stored in fObjectRotation, this rotation
- // has to be applied to the text object (which is internally using aGeo.nWink).
+ // has to be applied to the text object (which is internally using aGeo.nAngle).
SdrTextObj::NbcRotate( aRect.TopLeft(), -aGeo.nRotationAngle, // retrieving the unrotated text object
sin( (-aGeo.nRotationAngle) * F_PI18000 ),
cos( (-aGeo.nRotationAngle) * F_PI18000 ) );
@@ -1651,13 +1651,13 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou
if ( bMirroredY )
nSwap ^= 1;
- double fAngle = nWink; // updating to our new object rotation
+ double fAngle = nAngle; // updating to our new object rotation
fAngle /= 100.0;
fObjectRotation = fmod( nSwap ? fObjectRotation - fAngle : fObjectRotation + fAngle, 360.0 );
if ( fObjectRotation < 0 )
fObjectRotation = 360 + fObjectRotation;
- SdrTextObj::NbcRotate( rRef, nWink, sn, cs ); // applying text rotation
+ SdrTextObj::NbcRotate( rRef, nAngle, sn, cs ); // applying text rotation
InvalidateRenderGeometry();
}
@@ -1708,15 +1708,15 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
InvalidateRenderGeometry();
}
-void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, bool bVShear )
+void SdrObjCustomShape::Shear( const Point& rRef, long nAngle, double tn, bool bVShear )
{
- SdrTextObj::Shear( rRef, nWink, tn, bVShear );
+ SdrTextObj::Shear( rRef, nAngle, tn, bVShear );
InvalidateRenderGeometry();
}
-void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool bVShear )
+void SdrObjCustomShape::NbcShear( const Point& rRef, long nAngle, double tn, bool bVShear )
{
// TTTT: Fix for old mirroring, can be removed again in aw080
- SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+ SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
// updating fObjectRotation
long nTextObjRotation = aGeo.nRotationAngle;
@@ -3078,7 +3078,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
}
}
-// taking fObjectRotation instead of aGeo.nWink
+// taking fObjectRotation instead of aGeo.nAngle
bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// get turn and shear
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 77d39de..237b180 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1149,11 +1149,11 @@ void SdrObject::ImpForcePlusData()
pPlusData = NewPlusData();
}
-OUString SdrObject::GetAngleStr(long nWink, bool bNoDegChar) const
+OUString SdrObject::GetAngleStr(long nAngle, bool bNoDegChar) const
{
OUString aStr;
if (pModel!=NULL) {
- pModel->TakeAngleStr(nWink,aStr,bNoDegChar);
+ pModel->TakeAngleStr(nAngle,aStr,bNoDegChar);
}
return aStr;
}
@@ -1516,7 +1516,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
SetRectsDirty();
}
-void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrObject::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
SetGlueReallyAbsolute(true);
aOutRect.Move(-rRef.X(),-rRef.Y());
@@ -1540,7 +1540,7 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
aOutRect.Move(rRef.X(),rRef.Y());
aOutRect.Justify(); // just in case
SetRectsDirty();
- NbcRotateGluePoints(rRef,nWink,sn,cs);
+ NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
}
@@ -1575,10 +1575,10 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
SetGlueReallyAbsolute(false);
}
-void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrObject::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
SetGlueReallyAbsolute(true);
- NbcShearGluePoints(rRef,nWink,tn,bVShear);
+ NbcShearGluePoints(rRef,nAngle,tn,bVShear);
SetGlueReallyAbsolute(false);
}
@@ -1611,11 +1611,11 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction&
}
}
-void SdrObject::Rotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrObject::Rotate(const Point& rRef, long nAngle, double sn, double cs)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- NbcRotate(rRef,nWink,sn,cs);
+ NbcRotate(rRef,nAngle,sn,cs);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -1631,11 +1631,11 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
-void SdrObject::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrObject::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- NbcShear(rRef,nWink,tn,bVShear);
+ NbcShear(rRef,nAngle,tn,bVShear);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -2422,13 +2422,13 @@ void SdrObject::SetGlueReallyAbsolute(bool bOn)
}
}
-void SdrObject::NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs)
+void SdrObject::NbcRotateGluePoints(const Point& rRef, long nAngle, double sn, double cs)
{
// First a const call to see whether there are any glue points.
// Force const call!
if (GetGluePointList()!=NULL) {
SdrGluePointList* pGPL=ForceGluePointList();
- pGPL->Rotate(rRef,nWink,sn,cs,this);
+ pGPL->Rotate(rRef,nAngle,sn,cs,this);
}
}
@@ -2442,13 +2442,13 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
}
}
-void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrObject::NbcShearGluePoints(const Point& rRef, long nAngle, double tn, bool bVShear)
{
// First a const call to see whether there are any glue points.
// Force const call!
if (GetGluePointList()!=NULL) {
SdrGluePointList* pGPL=ForceGluePointList();
- pGPL->Shear(rRef,nWink,tn,bVShear,this);
+ pGPL->Shear(rRef,nAngle,tn,bVShear,this);
}
}
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 44bf9cf..25f2b7a 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -52,14 +52,14 @@
using namespace com::sun::star;
-Point GetAnglePnt(const Rectangle& rR, long nWink)
+Point GetAnglePnt(const Rectangle& rR, long nAngle)
{
Point aCenter(rR.Center());
long nWdt=rR.Right()-rR.Left();
long nHgt=rR.Bottom()-rR.Top();
long nMaxRad=((nWdt>nHgt ? nWdt : nHgt)+1) /2;
double a;
- a=nWink*nPi180;
+ a=nAngle*nPi180;
Point aRetval(Round(cos(a)*nMaxRad),-Round(sin(a)*nMaxRad));
if (nWdt==0) aRetval.X()=0;
if (nHgt==0) aRetval.Y()=0;
@@ -362,7 +362,7 @@ struct ImpCircUser : public SdrDragStatUserData
long nWdt;
long nStart;
long nEnd;
- long nWink;
+ long nAngle;
bool bRight; // not yet implemented
public:
@@ -372,7 +372,7 @@ public:
nWdt(0),
nStart(0),
nEnd(0),
- nWink(0),
+ nAngle(0),
bRight(false)
{}
void SetCreateParams(SdrDragStat& rStat);
@@ -521,7 +521,7 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
aPt.X()=BigMulDiv(aPt.X(),nHgt,nWdt);
}
- long nWink=NormAngle360(GetAngle(aPt));
+ long nAngle=NormAngle360(GetAngle(aPt));
if (rDrag.GetView() && rDrag.GetView()->IsAngleSnapEnabled())
{
@@ -529,20 +529,20 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
if (nSA!=0)
{
- nWink+=nSA/2;
- nWink/=nSA;
- nWink*=nSA;
- nWink=NormAngle360(nWink);
+ nAngle+=nSA/2;
+ nAngle/=nSA;
+ nAngle*=nSA;
+ nAngle=NormAngle360(nAngle);
}
}
if(1 == rDrag.GetHdl()->GetPointNum())
{
- nStartAngle = nWink;
+ nStartAngle = nAngle;
}
else if(2 == rDrag.GetHdl()->GetPointNum())
{
- nEndAngle = nWink;
+ nEndAngle = nAngle;
}
SetRectsDirty();
@@ -572,20 +572,20 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
if(OBJ_CIRC != meCircleKind && nPntAnz > 2)
{
const ImpCircUser* pU = static_cast<const ImpCircUser*>(rDrag.GetUser());
- sal_Int32 nWink;
+ sal_Int32 nAngle;
aBuf.appendAscii(" (");
if(3 == nPntAnz)
{
- nWink = pU->nStart;
+ nAngle = pU->nStart;
}
else
{
- nWink = pU->nEnd;
+ nAngle = pU->nEnd;
}
- aBuf.append(GetAngleStr(nWink,false));
+ aBuf.append(GetAngleStr(nAngle,false));
aBuf.append(')');
}
@@ -597,13 +597,13 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
if(bAngle)
{
- const sal_Int32 nWink(1 == rDrag.GetHdl()->GetPointNum() ? nStartAngle : nEndAngle);
+ const sal_Int32 nAngle(1 == rDrag.GetHdl()->GetPointNum() ? nStartAngle : nEndAngle);
OUString aStr;
ImpTakeDescriptionStr(STR_DragCircAngle, aStr);
OUStringBuffer aBuf(aStr);
aBuf.appendAscii(" (");
- aBuf.append(GetAngleStr(nWink,false));
+ aBuf.append(GetAngleStr(nAngle,false));
aBuf.append(')');
return aBuf.makeStringAndClear();
@@ -862,9 +862,9 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
ImpSetCircInfoToAttr();
}
-void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrCircObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+ SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
SetXPolyDirty();
ImpSetCircInfoToAttr();
}
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index aa88b86..3e8c25e 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2275,13 +2275,13 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
}
// #i54102# added rotation support
-void SdrEdgeObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrEdgeObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
if(bEdgeTrackUserDefined)
{
// #i120437# special handling when track is imported, apply
// transformation directly to imported track.
- SdrTextObj::NbcRotate(rRef, nWink, sn, cs);
+ SdrTextObj::NbcRotate(rRef, nAngle, sn, cs);
RotateXPoly(*pEdgeTrack, rRef, sn, cs);
}
else
@@ -2337,13 +2337,13 @@ void SdrEdgeObj::NbcMirror(const Point& rRef1, const Point& rRef2)
}
// #i54102# added shear support
-void SdrEdgeObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrEdgeObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
if(bEdgeTrackUserDefined)
{
// #i120437# special handling when track is imported, apply
// transformation directly to imported track.
- SdrTextObj::NbcShear(rRef, nWink, tn, bVShear);
+ SdrTextObj::NbcShear(rRef, nAngle, tn, bVShear);
ShearXPoly(*pEdgeTrack, rRef, tn, bVShear);
}
else
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index bb2d6b9..1bf234f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -908,9 +908,9 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
bMirrored = !bMirrored;
}
-void SdrGrafObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrGrafObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
- SdrRectObj::NbcRotate(rRef,nWink,sn,cs);
+ SdrRectObj::NbcRotate(rRef,nAngle,sn,cs);
}
void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2)
@@ -919,10 +919,10 @@ void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2)
bMirrored = !bMirrored;
}
-void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrGrafObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
// #i118485# Call Shear now, old version redirected to rotate
- SdrRectObj::NbcShear(rRef, nWink, tn, bVShear);
+ SdrRectObj::NbcShear(rRef, nAngle, tn, bVShear);
}
void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect)
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 8763413..1cf3d1c 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -468,7 +468,7 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
}
-void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrObjGroup::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
SetGlueReallyAbsolute(true);
RotatePoint(aRefPoint,rRef,sn,cs);
@@ -476,9 +476,9 @@ void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
const size_t nObjAnz = pOL->GetObjCount();
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- pObj->NbcRotate(rRef,nWink,sn,cs);
+ pObj->NbcRotate(rRef,nAngle,sn,cs);
}
- NbcRotateGluePoints(rRef,nWink,sn,cs);
+ NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
}
@@ -498,7 +498,7 @@ void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
}
-void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrObjGroup::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
SetGlueReallyAbsolute(true);
ShearPoint(aRefPoint,rRef,tn);
@@ -506,9 +506,9 @@ void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShea
const size_t nObjAnz = pOL->GetObjCount();
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- pObj->NbcShear(rRef,nWink,tn,bVShear);
+ pObj->NbcShear(rRef,nAngle,tn,bVShear);
}
- NbcShearGluePoints(rRef,nWink,tn,bVShear);
+ NbcShearGluePoints(rRef,nAngle,tn,bVShear);
SetGlueReallyAbsolute(false);
}
@@ -631,9 +631,9 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
}
-void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
SetGlueReallyAbsolute(true);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
RotatePoint(aRefPoint,rRef,sn,cs);
@@ -642,13 +642,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
const size_t nObjAnz = pOL->GetObjCount();
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
+ if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nAngle,sn,cs);
}
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
+ if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nAngle,sn,cs);
}
- NbcRotateGluePoints(rRef,nWink,sn,cs);
+ NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
@@ -681,9 +681,9 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
}
-void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
SetGlueReallyAbsolute(true);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
ShearPoint(aRefPoint,rRef,tn);
@@ -692,13 +692,13 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
const size_t nObjAnz = pOL->GetObjCount();
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
+ if (pObj->IsEdgeObj()) pObj->Shear(rRef,nAngle,tn,bVShear);
}
for (size_t i=0; i<nObjAnz; ++i) {
SdrObject* pObj=pOL->GetObj(i);
- if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
+ if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nAngle,tn,bVShear);
}
- NbcShearGluePoints(rRef,nWink,tn,bVShear);
+ NbcShearGluePoints(rRef,nAngle,tn,bVShear);
SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 050269e..70ff1a4 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1043,9 +1043,9 @@ void SdrMeasureObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fr
SetTextDirty();
}
-void SdrMeasureObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrMeasureObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
- SdrTextObj::NbcRotate(rRef,nWink,sn,cs);
+ SdrTextObj::NbcRotate(rRef,nAngle,sn,cs);
long nLen0=GetLen(aPt2-aPt1);
RotatePoint(aPt1,rRef,sn,cs);
RotatePoint(aPt2,rRef,sn,cs);
@@ -1074,9 +1074,9 @@ void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetRectsDirty();
}
-void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrMeasureObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+ SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
ShearPoint(aPt1,rRef,tn,bVShear);
ShearPoint(aPt2,rRef,tn,bVShear);
SetRectsDirty();
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index c88fa0b..c9647b0 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -979,9 +979,9 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
- sal_Int32 nWink(GetAngle(aNow));
+ sal_Int32 nAngle(GetAngle(aNow));
aStr += " ";
- mrSdrPathObject.GetModel()->TakeAngleStr(nWink, aMetr);
+ mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr);
aStr += aMetr;
}
@@ -1072,9 +1072,9 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
- sal_Int32 nWink(GetAngle(aNow));
+ sal_Int32 nAngle(GetAngle(aNow));
aStr += " ";
- mrSdrPathObject.GetModel()->TakeAngleStr(nWink, aMetr);
+ mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr);
aStr += aMetr;
}
else if(nPntAnz > 1)
@@ -1118,9 +1118,9 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
- sal_Int32 nWink(GetAngle(aPt));
+ sal_Int32 nAngle(GetAngle(aPt));
aStr += " ";
- mrSdrPathObject.GetModel()->TakeAngleStr(nWink, aMetr);
+ mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr);
aStr += aMetr;
}
@@ -1139,9 +1139,9 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
- sal_Int32 nWink(GetAngle(aPt));
+ sal_Int32 nAngle(GetAngle(aPt));
aStr += " ";
- mrSdrPathObject.GetModel()->TakeAngleStr(nWink, aMetr);
+ mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr);
aStr += aMetr;
}
}
@@ -2363,14 +2363,14 @@ void SdrPathObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
SdrTextObj::NbcResize(rRef,xFact,yFact);
}
-void SdrPathObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrPathObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
// Thank JOE, the angles are defined mirrored to the mathematical meanings
- const basegfx::B2DHomMatrix aTrans(basegfx::tools::createRotateAroundPoint(rRef.X(), rRef.Y(), -nWink * nPi180));
+ const basegfx::B2DHomMatrix aTrans(basegfx::tools::createRotateAroundPoint(rRef.X(), rRef.Y(), -nAngle * nPi180));
maPathPolygon.transform(aTrans);
// #i19871# first modify locally, then call parent (to get correct SnapRect with GluePoints)
- SdrTextObj::NbcRotate(rRef,nWink,sn,cs);
+ SdrTextObj::NbcRotate(rRef,nAngle,sn,cs);
}
void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear)
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index eb34b0d..65f5aa7 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -500,15 +500,15 @@ void SdrRectObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
SetXPolyDirty();
}
-void SdrRectObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrRectObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
- SdrTextObj::NbcRotate(rRef,nWink,sn,cs);
+ SdrTextObj::NbcRotate(rRef,nAngle,sn,cs);
SetXPolyDirty();
}
-void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrRectObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
+ SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
SetXPolyDirty();
}
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 262012b..01a1974 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -200,7 +200,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
SetRectsDirty();
}
-void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrTextObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
SetGlueReallyAbsolute(true);
long dx=aRect.Right()-aRect.Left();
@@ -212,19 +212,19 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
aRect.Right()=aRect.Left()+dx;
aRect.Bottom()=aRect.Top()+dy;
if (aGeo.nRotationAngle==0) {
- aGeo.nRotationAngle=NormAngle360(nWink);
+ aGeo.nRotationAngle=NormAngle360(nAngle);
aGeo.nSin=sn;
aGeo.nCos=cs;
} else {
- aGeo.nRotationAngle=NormAngle360(aGeo.nRotationAngle+nWink);
+ aGeo.nRotationAngle=NormAngle360(aGeo.nRotationAngle+nAngle);
aGeo.RecalcSinCos();
}
SetRectsDirty();
- NbcRotateGluePoints(rRef,nWink,sn,cs);
+ NbcRotateGluePoints(rRef,nAngle,sn,cs);
SetGlueReallyAbsolute(false);
}
-void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrTextObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
SetGlueReallyAbsolute(true);
@@ -242,7 +242,7 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
}
ImpCheckShear();
SetRectsDirty();
- NbcShearGluePoints(rRef,nWink,tn,bVShear);
+ NbcShearGluePoints(rRef,nAngle,tn,bVShear);
SetGlueReallyAbsolute(false);
}
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 122e8a5..8670db8 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -361,9 +361,9 @@ void SdrVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
SetRectsDirty();
}
-void SdrVirtObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrVirtObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
- rRefObj.NbcRotate(rRef-aAnchor,nWink,sn,cs);
+ rRefObj.NbcRotate(rRef-aAnchor,nAngle,sn,cs);
SetRectsDirty();
}
@@ -373,9 +373,9 @@ void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetRectsDirty();
}
-void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- rRefObj.NbcShear(rRef-aAnchor,nWink,tn,bVShear);
+ rRefObj.NbcShear(rRef-aAnchor,nAngle,tn,bVShear);
SetRectsDirty();
}
@@ -402,11 +402,11 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction
}
}
-void SdrVirtObj::Rotate(const Point& rRef, long nWink, double sn, double cs)
+void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- rRefObj.Rotate(rRef-aAnchor,nWink,sn,cs);
+ rRefObj.Rotate(rRef-aAnchor,nAngle,sn,cs);
SetRectsDirty();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
@@ -420,11 +420,11 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
-void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- if (nWink!=0) {
+ if (nAngle!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- rRefObj.Shear(rRef-aAnchor,nWink,tn,bVShear);
+ rRefObj.Shear(rRef-aAnchor,nAngle,tn,bVShear);
SetRectsDirty();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 2d9394d..1c43951 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -694,14 +694,14 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
if (pC2!=NULL) RotatePoint(*pC2,*(const Point*)p1,*(const double*)p3,*(const double*)p4);
}
-void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink)
+void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nAngle)
{
ForceUndirtyMrkPnt();
OUString aStr(ImpGetResStr(STR_EditResize));
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_ROTATE);
- double nSin=sin(nWink*nPi180);
- double nCos=cos(nWink*nPi180);
- ImpTransformMarkedPoints(ImpRotate,&rRef,&nWink,&nSin,&nCos);
+ double nSin=sin(nAngle*nPi180);
+ double nCos=cos(nAngle*nPi180);
+ ImpTransformMarkedPoints(ImpRotate,&rRef,&nAngle,&nSin,&nCos);
EndUndo();
AdjustMarkHdl();
}
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 31a4448..e5a6e67 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -136,8 +136,8 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
long nRefWink=GetAngle(rRef2-rRef1);
rPnt-=rRef1;
long nPntWink=GetAngle(rPnt);
- long nWink=2*(nRefWink-nPntWink);
- double a=nWink*nPi180;
+ long nAngle=2*(nRefWink-nPntWink);
+ double a=nAngle*nPi180;
double nSin=sin(a);
double nCos=cos(a);
RotatePoint(rPnt,Point(),nSin,nCos);
@@ -186,9 +186,9 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
long y0=rPnt.Y();
long cx=rCenter.X();
long cy=rCenter.Y();
- double nWink=GetCrookAngle(rPnt,rCenter,rRad,bVert);
- double sn=sin(nWink);
- double cs=cos(nWink);
+ double nAngle=GetCrookAngle(rPnt,rCenter,rRad,bVert);
+ double sn=sin(nAngle);
+ double cs=cos(nAngle);
RotatePoint(rPnt,rCenter,sn,cs);
if (bC1) {
if (bVert) {
@@ -228,7 +228,7 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
}
rSin=sn;
rCos=cs;
- return nWink;
+ return nAngle;
}
double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
@@ -266,9 +266,9 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente
pC2->Y()=nStart;
}
}
- double nWink=GetCrookAngle(rPnt,rCenter,rRad,bVert);
- double sn=sin(nWink);
- double cs=cos(nWink);
+ double nAngle=GetCrookAngle(rPnt,rCenter,rRad,bVert);
+ double sn=sin(nAngle);
+ double cs=cos(nAngle);
RotatePoint(rPnt,rCenter,sn,cs);
if (bC1) { if (bVert) pC1->Y()-=y0-rCenter.Y(); else pC1->X()-=x0-rCenter.X(); RotatePoint(*pC1,rCenter,sn,cs); }
if (bC2) { if (bVert) pC2->Y()-=y0-rCenter.Y(); else pC2->X()-=x0-rCenter.X(); RotatePoint(*pC2,rCenter,sn,cs); }
@@ -283,7 +283,7 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente
}
rSin=sn;
rCos=cs;
- return nWink;
+ return nAngle;
}
double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
@@ -431,13 +431,13 @@ long NormAngle360(long a)
return a;
}
-sal_uInt16 GetAngleSector(long nWink)
+sal_uInt16 GetAngleSector(long nAngle)
{
- while (nWink<0) nWink+=36000;
- while (nWink>=36000) nWink-=36000;
- if (nWink< 9000) return 0;
- if (nWink<18000) return 1;
- if (nWink<27000) return 2;
+ while (nAngle<0) nAngle+=36000;
+ while (nAngle>=36000) nAngle-=36000;
+ if (nAngle< 9000) return 0;
+ if (nAngle<18000) return 1;
+ if (nAngle<27000) return 2;
return 3;
}
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 9f5ef1f..f141f77 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -280,14 +280,14 @@ class SwDrawVirtObj : public SdrVirtObj
virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
- virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
+ virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
+ virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
virtual void RecalcSnapRect() SAL_OVERRIDE;
virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE;
virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 861ab97..fc85ef5 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2377,9 +2377,9 @@ void SwDrawVirtObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fr
SetRectsDirty();
}
-void SwDrawVirtObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
+void SwDrawVirtObj::NbcRotate(const Point& rRef, long nAngle, double sn, double cs)
{
- rRefObj.NbcRotate(rRef - GetOffset(), nWink, sn, cs);
+ rRefObj.NbcRotate(rRef - GetOffset(), nAngle, sn, cs);
SetRectsDirty();
}
@@ -2389,9 +2389,9 @@ void SwDrawVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetRectsDirty();
}
-void SwDrawVirtObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SwDrawVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- rRefObj.NbcShear(rRef - GetOffset(), nWink, tn, bVShear);
+ rRefObj.NbcShear(rRef - GetOffset(), nAngle, tn, bVShear);
SetRectsDirty();
}
@@ -2411,12 +2411,12 @@ void SwDrawVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fract
}
}
-void SwDrawVirtObj::Rotate(const Point& rRef, long nWink, double sn, double cs)
+void SwDrawVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs)
{
- if(nWink)
+ if(nAngle)
{
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
- rRefObj.Rotate(rRef - GetOffset(), nWink, sn, cs);
+ rRefObj.Rotate(rRef - GetOffset(), nAngle, sn, cs);
SetRectsDirty();
SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
}
@@ -2430,12 +2430,12 @@ void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
}
-void SwDrawVirtObj::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
+void SwDrawVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
- if(nWink)
+ if(nAngle)
{
Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetLastBoundRect();
- rRefObj.Shear(rRef - GetOffset(), nWink, tn, bVShear);
+ rRefObj.Shear(rRef - GetOffset(), nAngle, tn, bVShear);
SetRectsDirty();
SendUserCall(SDRUSERCALL_RESIZE, aBoundRect0);
}
commit d1974ddf3a84d2a4a3082920f812857c85218fc2
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 4 13:31:01 2014 +0200
some random renaming of Wink fields -> Angle
Change-Id: Icd4df8610072f5283276738896cb5c01762838ea
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 37d9a0c..14e8f46 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -74,10 +74,10 @@ public:
SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect);
// 0=0.00Deg=3h 9000=90.00Deg=12h 18000=180.00Deg=9h 27000=270.00Deg=6h
- // The circle is build up from StartWink to EndWink anti-clockwise.
- // If nNewStartWink==nNewEndWink, then arc has an angle of 0 degrees.
- // If nNewStartWink+36000==nNewEndWink, then the arc has angle of 360 degrees.
- SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartWink, long nNewEndWink);
+ // The circle is build up from StartAngle to EndWink anti-clockwise.
+ // If nNewStartAngle==nNewEndWink, then arc has an angle of 0 degrees.
+ // If nNewStartAngle+36000==nNewEndWink, then the arc has angle of 360 degrees.
+ SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartAngle, long nNewEndWink);
virtual ~SdrCircObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE;
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index b9cb18f..ea1bd16 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -62,7 +62,7 @@ protected:
// helper functions for GET, SET, INS etc. PNT
void ImpSetClosed(bool bClose);
void ImpForceKind();
- void ImpForceLineWink();
+ void ImpForceLineAngle();
ImpPathForDragAndCreate& impGetDAC() const;
void impDeleteDAC() const;
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index cd8fc5e..d2ce026 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -308,9 +308,9 @@ long SdrEditView::GetMarkedObjRotate() const
//for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
// SdrMark* pM=GetSdrMarkByIndex(nm);
// SdrObject* pO=pM->GetMarkedSdrObj();
- // long nWink2=pO->GetRotateAngle();
- // if (b1st) nWink=nWink2;
- // else if (nWink2!=nWink) bOk=false;
+ // long nAngle2=pO->GetRotateAngle();
+ // if (b1st) nWink=nAngle2;
+ // else if (nAngle2!=nWink) bOk=false;
// b1st=false;
//}
//if (!bOk) nWink=0;
@@ -459,9 +459,9 @@ long SdrEditView::GetMarkedObjShear() const
for (size_t nm=0; nm<nMarkAnz && bOk; ++nm) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
- long nWink2=pO->GetShearAngle();
- if (b1st) nWink=nWink2;
- else if (nWink2!=nWink) bOk=false;
+ long nAngle2=pO->GetShearAngle();
+ if (b1st) nWink=nAngle2;
+ else if (nAngle2!=nWink) bOk=false;
b1st=false;
}
if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 9108eae..c73a05b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1651,9 +1651,9 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou
if ( bMirroredY )
nSwap ^= 1;
- double fWink = nWink; // updating to our new object rotation
- fWink /= 100.0;
- fObjectRotation = fmod( nSwap ? fObjectRotation - fWink : fObjectRotation + fWink, 360.0 );
+ double fAngle = nWink; // updating to our new object rotation
+ fAngle /= 100.0;
+ fObjectRotation = fmod( nSwap ? fObjectRotation - fAngle : fObjectRotation + fAngle, 360.0 );
if ( fObjectRotation < 0 )
fObjectRotation = 360 + fObjectRotation;
@@ -1690,13 +1690,13 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
// update fObjectRotation
long nTextObjRotation = aGeo.nRotationAngle;
- double fWink = nTextObjRotation;
+ double fAngle = nTextObjRotation;
- fWink /= 100.0;
+ fAngle /= 100.0;
bool bSingleFlip = (IsMirroredX()!= IsMirroredY());
- fObjectRotation = fmod( bSingleFlip ? -fWink : fWink, 360.0 );
+ fObjectRotation = fmod( bSingleFlip ? -fAngle : fAngle, 360.0 );
if ( fObjectRotation < 0 )
{
@@ -1720,13 +1720,13 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool
// updating fObjectRotation
long nTextObjRotation = aGeo.nRotationAngle;
- double fWink = nTextObjRotation;
+ double fAngle = nTextObjRotation;
- fWink /= 100.0;
+ fAngle /= 100.0;
bool bSingleFlip = (IsMirroredX()!= IsMirroredY());
- fObjectRotation = fmod( bSingleFlip ? -fWink : fWink, 360.0 );
+ fObjectRotation = fmod( bSingleFlip ? -fAngle : fAngle, 360.0 );
if ( fObjectRotation < 0 )
{
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index f927e1a..44bf9cf 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -128,10 +128,10 @@ SdrCircObj::SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect):
SdrCircObj::SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartWink, long nNewEndWink):
SdrRectObj(rRect)
{
- long nWinkDif=nNewEndWink-nNewStartWink;
+ long nAngleDif=nNewEndWink-nNewStartWink;
nStartAngle=NormAngle360(nNewStartWink);
nEndAngle=NormAngle360(nNewEndWink);
- if (nWinkDif==36000) nEndAngle+=nWinkDif; // full circle
+ if (nAngleDif==36000) nEndAngle+=nAngleDif; // full circle
meCircleKind=eNewKind;
bClosedObj=eNewKind!=OBJ_CARC;
}
@@ -478,9 +478,9 @@ bool SdrCircObj::hasSpecialDrag() const
bool SdrCircObj::beginSpecialDrag(SdrDragStat& rDrag) const
{
- const bool bWink(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
+ const bool bAngle(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
- if(bWink)
+ if(bAngle)
{
if(1 == rDrag.GetHdl()->GetPointNum() || 2 == rDrag.GetHdl()->GetPointNum())
{
@@ -495,9 +495,9 @@ bool SdrCircObj::beginSpecialDrag(SdrDragStat& rDrag) const
bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
{
- const bool bWink(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
+ const bool bAngle(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
- if(bWink)
+ if(bAngle)
{
Point aPt(rDrag.GetNow());
@@ -593,9 +593,9 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
}
else
{
- const bool bWink(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
+ const bool bAngle(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
- if(bWink)
+ if(bAngle)
{
const sal_Int32 nWink(1 == rDrag.GetHdl()->GetPointNum() ? nStartAngle : nEndAngle);
@@ -852,10 +852,10 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
nE0-=aGeo.nRotationAngle;
}
}
- long nWinkDif=nE0-nS0;
+ long nAngleDif=nE0-nS0;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list