From 43327878920f424f8bac1114bee51c54609796c5 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 21 Oct 2014 08:56:06 +0200
Subject: nShearWink -> nShearAngle

Change-Id: I122f16783db4025b9335ed82a12f051516d98d4c
---
 svx/source/svdraw/svdedtv2.cxx |  6 +++---
 svx/source/svdraw/svdoashp.cxx | 26 +++++++++++++-------------
 svx/source/svdraw/svdocirc.cxx | 28 ++++++++++++++--------------
 svx/source/svdraw/svdograf.cxx |  4 ++--
 svx/source/svdraw/svdopath.cxx | 12 ++++++------
 svx/source/svdraw/svdorect.cxx | 18 +++++++++---------
 svx/source/svdraw/svdotext.cxx | 20 ++++++++++----------
 svx/source/svdraw/svdotxdr.cxx |  8 ++++----
 svx/source/svdraw/svdotxtr.cxx | 18 +++++++++---------
 svx/source/svdraw/svdouno.cxx  |  4 ++--
 svx/source/svdraw/svdtrans.cxx |  8 ++++----
 11 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'svx/source/svdraw')

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 32d23c84aa89..5ff10660e2c1 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2032,7 +2032,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
             GeoStat aGeoStat(pGraf ? pGraf->GetGeoStat() : pOle2->GetGeoStat());
             size_t nObj=nInsPos;
 
-            if(aGeoStat.nShearWink)
+            if(aGeoStat.nShearAngle)
             {
                 aGeoStat.RecalcTan();
             }
@@ -2051,9 +2051,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
                 SdrObject* pCandidate = pOL->GetObj(nObj);
 
                 // apply original transformation
-                if(aGeoStat.nShearWink)
+                if(aGeoStat.nShearAngle)
                 {
-                    pCandidate->NbcShear(aLogicRect.TopLeft(), aGeoStat.nShearWink, aGeoStat.nTan, false);
+                    pCandidate->NbcShear(aLogicRect.TopLeft(), aGeoStat.nShearAngle, aGeoStat.nTan, false);
                 }
 
                 if(aGeoStat.nRotationAngle)
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 2d01c001d4ce..be38ea99c3dc 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1757,7 +1757,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
         case 2: aPt=aRect.BottomCenter(); aPt.Y()+=nWdt; break;
         case 3: aPt=aRect.LeftCenter();   aPt.X()-=nWdt; break;
     }
-    if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
@@ -1800,13 +1800,13 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                 bool bMirroredX = IsMirroredX();
                 bool bMirroredY = IsMirroredY();
 
-                long nShearWink = aGeo.nShearWink;
+                long nShearAngle = aGeo.nShearAngle;
                 double fTan = aGeo.nTan;
 
-                if ( aGeo.nRotationAngle || nShearWink || bMirroredX || bMirroredY )
+                if ( aGeo.nRotationAngle || nShearAngle || bMirroredX || bMirroredY )
                 {
                     Polygon aPoly( aRect );
-                    if( nShearWink )
+                    if( nShearAngle )
                     {
                         sal_uInt16 nPointCount=aPoly.GetSize();
                         for (sal_uInt16 i=0; i<nPointCount; i++)
@@ -1819,9 +1819,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     sal_Int32 nXDiff = aBoundRect.Left() - aRect.Left();
                     sal_Int32 nYDiff = aBoundRect.Top() - aRect.Top();
 
-                    if (nShearWink&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)))
+                    if (nShearAngle&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)))
                     {
-                        nShearWink = -nShearWink;
+                        nShearAngle = -nShearAngle;
                         fTan = -fTan;
                     }
 
@@ -1830,7 +1830,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
                     {
                         SdrGluePoint& rPoint = aNewList[ a ];
                         Point aGlue( rPoint.GetPos() );
-                        if ( nShearWink )
+                        if ( nShearAngle )
                             ShearPoint( aGlue, aRef, fTan );
 
                         RotatePoint( aGlue, aRef, sin( fObjectRotation * F_PI180 ), cos( fObjectRotation * F_PI180 ) );
@@ -1987,10 +1987,10 @@ void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect )
 
     GeoStat aGeoStat( GetGeoStat() );
     if ( aNewRect.TopLeft()!= aRect.TopLeft() &&
-        ( aGeo.nRotationAngle || aGeo.nShearWink ) )
+        ( aGeo.nRotationAngle || aGeo.nShearAngle ) )
     {
         Point aNewPos( aNewRect.TopLeft() );
-        if ( aGeo.nShearWink ) ShearPoint( aNewPos, aOld.TopLeft(), aGeoStat.nTan );
+        if ( aGeo.nShearAngle ) ShearPoint( aNewPos, aOld.TopLeft(), aGeoStat.nTan );
         if ( aGeo.nRotationAngle )  RotatePoint(aNewPos, aOld.TopLeft(), aGeoStat.nSin, aGeoStat.nCos );
         aNewRect.SetPos( aNewPos );
     }
@@ -3000,7 +3000,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
     // reset object shear and rotations
     aGeo.nRotationAngle = 0;
     aGeo.RecalcSinCos();
-    aGeo.nShearWink = 0;
+    aGeo.nShearAngle = 0;
     aGeo.RecalcTan();
 
     // force metric to pool metric
@@ -3054,9 +3054,9 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
         // #i123181# The fix for #121932# here was wrong, the trunk version does not correct the
         // mirrored shear values, neither at the object level, nor on the API or XML level. Taking
         // back the mirroring of the shear angle
-        aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
+        aGeoStat.nShearAngle = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, false);
+        Shear(Point(), aGeoStat.nShearAngle, aGeoStat.nTan, false);
     }
 
     // rotation?
@@ -3084,7 +3084,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf
 {
     // get turn and shear
     double fRotate = fObjectRotation * F_PI180;
-    double fShearX = (aGeo.nShearWink / 100.0) * F_PI180;
+    double fShearX = (aGeo.nShearAngle / 100.0) * F_PI180;
 
     // get aRect, this is the unrotated snaprect
     Rectangle aRectangle(aRect);
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 1a4d79fdce7b..e1232279bea6 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -160,7 +160,7 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const
     // ellipse segments.
     // If not WIN, then (for now) also for circle/ellipse segments and circle/
     // ellipse arcs (for precision)
-    bool bNeed=aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
+    bool bNeed=aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0 || meCircleKind==OBJ_CCUT;
     // If not WIN, then for everything except full circle (for now!)
     if (meCircleKind!=OBJ_CIRC) bNeed = true;
 
@@ -257,7 +257,7 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrObjKind eCicrleKind, c
     }
 
     // #i76950#
-    if(aGeo.nShearWink || aGeo.nRotationAngle)
+    if(aGeo.nShearAngle || aGeo.nRotationAngle)
     {
         // translate top left to (0,0)
         const basegfx::B2DPoint aTopLeft(aRange.getMinimum());
@@ -266,7 +266,7 @@ basegfx::B2DPolygon SdrCircObj::ImpCalcXPolyCirc(const SdrObjKind eCicrleKind, c
 
         // shear, rotate and back to top left (if needed)
         aMatrix = basegfx::tools::createShearXRotateTranslateB2DHomMatrix(
-            aGeo.nShearWink ? tan((36000 - aGeo.nShearWink) * F_PI18000) : 0.0,
+            aGeo.nShearAngle ? tan((36000 - aGeo.nShearAngle) * F_PI18000) : 0.0,
             aGeo.nRotationAngle ? (36000 - aGeo.nRotationAngle) * F_PI18000 : 0.0,
             aTopLeft) * aMatrix;
 
@@ -286,7 +286,7 @@ void SdrCircObj::RecalcXPoly()
 OUString SdrCircObj::TakeObjNameSingul() const
 {
     sal_uInt16 nID=STR_ObjNameSingulCIRC;
-    if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
+    if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearAngle==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
             case OBJ_SECT: nID=STR_ObjNameSingulSECT; break;
@@ -319,7 +319,7 @@ OUString SdrCircObj::TakeObjNameSingul() const
 OUString SdrCircObj::TakeObjNamePlural() const
 {
     sal_uInt16 nID=STR_ObjNamePluralCIRC;
-    if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
+    if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearAngle==0) {
         switch (meCircleKind) {
             case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
             case OBJ_SECT: nID=STR_ObjNamePluralSECT; break;
@@ -448,7 +448,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const
             break;
     }
 
-    if (aGeo.nShearWink)
+    if (aGeo.nShearAngle)
     {
         ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
     }
@@ -504,7 +504,7 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
         if (aGeo.nRotationAngle!=0)
             RotatePoint(aPt,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
 
-        if (aGeo.nShearWink!=0)
+        if (aGeo.nShearAngle!=0)
             ShearPoint(aPt,aRect.TopLeft(),-aGeo.nTan);
 
         aPt-=aRect.Center();
@@ -814,9 +814,9 @@ void SdrCircObj::NbcMove(const Size& aSiz)
 void SdrCircObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact)
 {
     long nWink0=aGeo.nRotationAngle;
-    bool bNoShearRota=(aGeo.nRotationAngle==0 && aGeo.nShearWink==0);
+    bool bNoShearRota=(aGeo.nRotationAngle==0 && aGeo.nShearAngle==0);
     SdrTextObj::NbcResize(rRef,xFact,yFact);
-    bNoShearRota|=(aGeo.nRotationAngle==0 && aGeo.nShearWink==0);
+    bNoShearRota|=(aGeo.nRotationAngle==0 && aGeo.nShearAngle==0);
     if (meCircleKind!=OBJ_CIRC) {
         bool bXMirr = xFact < 0;
         bool bYMirr = yFact < 0;
@@ -896,7 +896,7 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
             RotatePoint(aTmpPt1,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
             RotatePoint(aTmpPt2,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
         }
-        if (aGeo.nShearWink!=0) {
+        if (aGeo.nShearAngle!=0) {
             ShearPoint(aTmpPt1,aRect.TopLeft(),aGeo.nTan);
             ShearPoint(aTmpPt2,aRect.TopLeft(),aGeo.nTan);
         }
@@ -911,7 +911,7 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
             RotatePoint(aTmpPt2,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos); // -sin for reversion
         }
         // unshear:
-        if (aGeo.nShearWink!=0) {
+        if (aGeo.nShearAngle!=0) {
             ShearPoint(aTmpPt1,aRect.TopLeft(),-aGeo.nTan); // -tan for reversion
             ShearPoint(aTmpPt2,aRect.TopLeft(),-aGeo.nTan); // -tan for reversion
         }
@@ -999,9 +999,9 @@ void SdrCircObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
             rRect.Move(aDst.X(),aDst.Y());
         }
     }
-    if (aGeo.nShearWink!=0) {
+    if (aGeo.nShearAngle!=0) {
         long nDst=Round((rRect.Bottom()-rRect.Top())*aGeo.nTan);
-        if (aGeo.nShearWink>0) {
+        if (aGeo.nShearAngle>0) {
             Point aRef(rRect.TopLeft());
             rRect.Left()-=nDst;
             Point aTmpPt(rRect.TopLeft());
@@ -1025,7 +1025,7 @@ void SdrCircObj::RecalcSnapRect()
 
 void SdrCircObj::NbcSetSnapRect(const Rectangle& rRect)
 {
-    if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0 || meCircleKind!=OBJ_CIRC) {
+    if (aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0 || meCircleKind!=OBJ_CIRC) {
         Rectangle aSR0(GetSnapRect());
         long nWdt0=aSR0.Right()-aSR0.Left();
         long nHgt0=aSR0.Bottom()-aSR0.Top();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index d40679fcb19f..91f84a740213 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1092,10 +1092,10 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const
                         // copy transformation
                     GeoStat aGeoStat(GetGeoStat());
 
-                    if(aGeoStat.nShearWink)
+                    if(aGeoStat.nShearAngle)
                     {
                         aGeoStat.RecalcTan();
-                        pGrp->NbcShear(aRect.TopLeft(), aGeoStat.nShearWink, aGeoStat.nTan, false);
+                        pGrp->NbcShear(aRect.TopLeft(), aGeoStat.nShearAngle, aGeoStat.nTan, false);
                     }
 
                     if(aGeoStat.nRotationAngle)
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index f2493818682f..54ad34c5008a 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1713,7 +1713,7 @@ void SdrPathObj::ImpForceLineWink()
         const Point aDelt(aPoint1 - aPoint0);
 
         aGeo.nRotationAngle=GetAngle(aDelt);
-        aGeo.nShearWink=0;
+        aGeo.nShearAngle=0;
         aGeo.RecalcSinCos();
         aGeo.RecalcTan();
 
@@ -2893,16 +2893,16 @@ bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP
         }
         else
         {
-            if(aGeo.nShearWink || aGeo.nRotationAngle)
+            if(aGeo.nShearAngle || aGeo.nRotationAngle)
             {
                 // get rotate and shear in drawingLayer notation
                 fRotate = aGeo.nRotationAngle * F_PI18000;
-                fShearX = aGeo.nShearWink * F_PI18000;
+                fShearX = aGeo.nShearAngle * F_PI18000;
 
                 // build mathematically correct (negative shear and rotate) object transform
                 // containing shear and rotate to extract unsheared, unrotated polygon
                 basegfx::B2DHomMatrix aObjectMatrix;
-                aObjectMatrix.shearX(tan((36000 - aGeo.nShearWink) * F_PI18000));
+                aObjectMatrix.shearX(tan((36000 - aGeo.nShearAngle) * F_PI18000));
                 aObjectMatrix.rotate((36000 - aGeo.nRotationAngle) * F_PI18000);
 
                 // create inverse from it and back-transform polygon
@@ -3019,7 +3019,7 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     // reset object shear and rotations
     aGeo.nRotationAngle = 0;
     aGeo.RecalcSinCos();
-    aGeo.nShearWink = 0;
+    aGeo.nShearAngle = 0;
     aGeo.RecalcTan();
 
     // force metric to pool metric
@@ -3078,7 +3078,7 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     if(!basegfx::fTools::equalZero(fShearX))
     {
         aTransform.shearX(tan(-atan(fShearX)));
-        aGeo.nShearWink = FRound(atan(fShearX) / F_PI18000);
+        aGeo.nShearAngle = FRound(atan(fShearX) / F_PI18000);
         aGeo.RecalcTan();
     }
 
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index dbc37aaf5cc2..8c594d682e10 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -145,7 +145,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
     aXPoly=aNeuPoly;
 
     // these angles always relate to the top left corner of aRect
-    if (aGeo.nShearWink!=0) ShearXPoly(aXPoly,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearXPoly(aXPoly,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotateXPoly(aXPoly,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     return aXPoly;
 }
@@ -205,9 +205,9 @@ sal_uInt16 SdrRectObj::GetObjIdentifier() const
 void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
 {
     rRect=aRect;
-    if (aGeo.nShearWink!=0) {
+    if (aGeo.nShearAngle!=0) {
         long nDst=Round((aRect.Bottom()-aRect.Top())*aGeo.nTan);
-        if (aGeo.nShearWink>0) {
+        if (aGeo.nShearAngle>0) {
             Point aRef(rRect.TopLeft());
             rRect.Left()-=nDst;
             Point aTmpPt(rRect.TopLeft());
@@ -230,7 +230,7 @@ OUString SdrRectObj::TakeObjNameSingul() const
     OUStringBuffer sName;
 
     sal_uInt16 nResId=STR_ObjNameSingulRECT;
-    if (aGeo.nShearWink!=0) {
+    if (aGeo.nShearAngle!=0) {
         nResId+=4;  // parallelogram or, maybe, rhombus
     } else {
         if (aRect.GetWidth()==aRect.GetHeight()) nResId+=2; // square
@@ -259,7 +259,7 @@ OUString SdrRectObj::TakeObjNamePlural() const
 
     sal_uInt16 nResId=STR_ObjNamePluralRECT;
 
-    if (aGeo.nShearWink!=0)
+    if (aGeo.nShearAngle!=0)
     {
         nResId+=4;  // parallelogram or rhombus
     }
@@ -290,7 +290,7 @@ basegfx::B2DPolyPolygon SdrRectObj::TakeXorPoly() const
 void SdrRectObj::RecalcSnapRect()
 {
     long nEckRad=GetEckenradius();
-    if ((aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) && nEckRad!=0) {
+    if ((aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0) && nEckRad!=0) {
         maSnapRect=GetXPoly().GetBoundRect();
     } else {
         SdrTextObj::RecalcSnapRect();
@@ -360,7 +360,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const
 
     if(!pH)
     {
-        if(aGeo.nShearWink)
+        if(aGeo.nShearAngle)
         {
             ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
         }
@@ -546,7 +546,7 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
         case 2: aPt=aRect.BottomCenter(); aPt.Y()+=nWdt; break;
         case 3: aPt=aRect.LeftCenter();   aPt.X()-=nWdt; break;
     }
-    if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
@@ -572,7 +572,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
         case 2: aPt=aRect.BottomRight(); aPt.X()+=nWdt; aPt.Y()+=nWdt; break;
         case 3: aPt=aRect.BottomLeft();  aPt.X()-=nWdt; aPt.Y()+=nWdt; break;
     }
-    if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     aPt-=GetSnapRect().Center();
     SdrGluePoint aGP(aPt);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3259330504cd..9fa6cb62b248 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -423,8 +423,8 @@ void SdrTextObj::ImpJustifyRect(Rectangle& rRect) const
 
 void SdrTextObj::ImpCheckShear()
 {
-    if (bNoShear && aGeo.nShearWink!=0) {
-        aGeo.nShearWink=0;
+    if (bNoShear && aGeo.nShearAngle!=0) {
+        aGeo.nShearAngle=0;
         aGeo.nTan=0;
     }
 }
@@ -1116,7 +1116,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
 basegfx::B2DPolyPolygon SdrTextObj::TakeXorPoly() const
 {
     Polygon aPol(aRect);
-    if (aGeo.nShearWink!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
 
     basegfx::B2DPolyPolygon aRetval;
@@ -1153,9 +1153,9 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
 
 void SdrTextObj::RecalcSnapRect()
 {
-    if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) {
+    if (aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0) {
         Polygon aPol(aRect);
-        if (aGeo.nShearWink!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
+        if (aGeo.nShearAngle!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
         if (aGeo.nRotationAngle!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
         maSnapRect=aPol.GetBoundRect();
     } else {
@@ -1178,7 +1178,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
         case 3: aP=aRect.BottomRight(); break;
         default: aP=aRect.Center(); break;
     }
-    if (aGeo.nShearWink!=0) ShearPoint(aP,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aP,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoint(aP,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     return aP;
 }
@@ -1597,7 +1597,7 @@ bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP
 {
     // get turn and shear
     double fRotate = (aGeo.nRotationAngle / 100.0) * F_PI180;
-    double fShearX = (aGeo.nShearWink / 100.0) * F_PI180;
+    double fShearX = (aGeo.nShearAngle / 100.0) * F_PI180;
 
     // get aRect, this is the unrotated snaprect
     Rectangle aRectangle(aRect);
@@ -1674,7 +1674,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     // reset object shear and rotations
     aGeo.nRotationAngle = 0;
     aGeo.RecalcSinCos();
-    aGeo.nShearWink = 0;
+    aGeo.nShearAngle = 0;
     aGeo.RecalcTan();
 
     // force metric to pool metric
@@ -1721,9 +1721,9 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
     if(!basegfx::fTools::equalZero(fShearX))
     {
         GeoStat aGeoStat;
-        aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
+        aGeoStat.nShearAngle = FRound((atan(fShearX) / F_PI180) * 100.0);
         aGeoStat.RecalcTan();
-        Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, false);
+        Shear(Point(), aGeoStat.nShearAngle, aGeoStat.nTan, false);
     }
 
     // rotation?
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index d85bf2757ed3..e710f00a3808 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -52,7 +52,7 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const
         case 6: aPnt=aRect.BottomCenter(); eKind=HDL_LOWER; break;
         case 7: aPnt=aRect.BottomRight();  eKind=HDL_LWRGT; break;
     }
-    if (aGeo.nShearWink!=0) ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
     if (aGeo.nRotationAngle!=0) RotatePoint(aPnt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
     if (eKind!=HDL_MOVE) {
         pH=new SdrHdl(aPnt,eKind);
@@ -81,7 +81,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const
     // Unrotate:
     if (aGeo.nRotationAngle!=0) RotatePoint(aPos,aTmpRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
     // Unshear:
-    if (aGeo.nShearWink!=0) ShearPoint(aPos,aTmpRect.TopLeft(),-aGeo.nTan);
+    if (aGeo.nShearAngle!=0) ShearPoint(aPos,aTmpRect.TopLeft(),-aGeo.nTan);
 
     bool bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT  || eHdl==HDL_LWLFT);
     bool bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT);
@@ -150,11 +150,11 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag)
 {
     Rectangle aNewRect(ImpDragCalcRect(rDrag));
 
-    if(aNewRect.TopLeft() != aRect.TopLeft() && (aGeo.nRotationAngle || aGeo.nShearWink))
+    if(aNewRect.TopLeft() != aRect.TopLeft() && (aGeo.nRotationAngle || aGeo.nShearAngle))
     {
         Point aNewPos(aNewRect.TopLeft());
 
-        if(aGeo.nShearWink)
+        if(aGeo.nShearAngle)
             ShearPoint(aNewPos,aRect.TopLeft(),aGeo.nTan);
 
         if(aGeo.nRotationAngle)
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 64a48cae777c..120c3b70ce94 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
 
 void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect)
 {
-    if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) {
+    if (aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0) {
         Rectangle aSR0(GetSnapRect());
         long nWdt0=aSR0.Right()-aSR0.Left();
         long nHgt0=aSR0.Bottom()-aSR0.Top();
@@ -107,7 +107,7 @@ long SdrTextObj::GetRotateAngle() const
 
 long SdrTextObj::GetShearAngle(bool /*bVertical*/) const
 {
-    return aGeo.nShearWink;
+    return aGeo.nShearAngle;
 }
 
 void SdrTextObj::NbcMove(const Size& rSiz)
@@ -120,7 +120,7 @@ void SdrTextObj::NbcMove(const Size& rSiz)
 
 void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact)
 {
-    bool bNoShearMerk=aGeo.nShearWink==0;
+    bool bNoShearMerk=aGeo.nShearAngle==0;
     bool bRota90Merk=bNoShearMerk && aGeo.nRotationAngle % 9000 ==0;
     long nHDist=GetTextLeftDistance()+GetTextRightDistance();
     long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
@@ -142,7 +142,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>&
         }
     }
 
-    if (aGeo.nRotationAngle==0 && aGeo.nShearWink==0) {
+    if (aGeo.nRotationAngle==0 && aGeo.nShearAngle==0) {
         ResizeRect(aRect,rRef,xFact,yFact);
         if (bYMirr) {
             aRect.Justify();
@@ -187,8 +187,8 @@ void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>&
             aGeo.nRotationAngle=a;
             aGeo.RecalcSinCos();
         }
-        if (bNoShearMerk!=(aGeo.nShearWink==0)) { // correct a rounding error occurring with Shear
-            aGeo.nShearWink=0;
+        if (bNoShearMerk!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
+            aGeo.nShearAngle=0;
             aGeo.RecalcTan();
         }
     }
@@ -259,7 +259,7 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
 void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
     SetGlueReallyAbsolute(true);
-    bool bNoShearMerk=aGeo.nShearWink==0;
+    bool bNoShearMerk=aGeo.nShearAngle==0;
     bool bRota90Merk = false;
     if (bNoShearMerk &&
         (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
@@ -294,8 +294,8 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
             aGeo.RecalcSinCos();
         }
     }
-    if (bNoShearMerk!=(aGeo.nShearWink==0)) { // correct a rounding error occurring with Shear
-        aGeo.nShearWink=0;
+    if (bNoShearMerk!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
+        aGeo.nShearAngle=0;
         aGeo.RecalcTan();
     }
 
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index a577387a464b..db43713e7a72 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -324,7 +324,7 @@ void SdrUnoObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& x
 {
     SdrRectObj::NbcResize(rRef,xFact,yFact);
 
-    if (aGeo.nShearWink!=0 || aGeo.nRotationAngle!=0)
+    if (aGeo.nShearAngle!=0 || aGeo.nRotationAngle!=0)
     {
         // small correctures
         if (aGeo.nRotationAngle>=9000 && aGeo.nRotationAngle<27000)
@@ -333,7 +333,7 @@ void SdrUnoObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& x
         }
 
         aGeo.nRotationAngle  = 0;
-        aGeo.nShearWink = 0;
+        aGeo.nShearAngle = 0;
         aGeo.nSin       = 0.0;
         aGeo.nCos       = 1.0;
         aGeo.nTan       = 0.0;
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 195abe60fcb3..8cc4c730a08c 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -456,10 +456,10 @@ void GeoStat::RecalcSinCos()
 
 void GeoStat::RecalcTan()
 {
-    if (nShearWink==0) {
+    if (nShearAngle==0) {
         nTan=0.0;
     } else {
-        double a=nShearWink*nPi180;
+        double a=nShearAngle*nPi180;
         nTan=tan(a);
     }
 }
@@ -474,7 +474,7 @@ Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo)
     aPol[2]=rRect.BottomRight();
     aPol[3]=rRect.BottomLeft();
     aPol[4]=rRect.TopLeft();
-    if (rGeo.nShearWink!=0) ShearPoly(aPol,rRect.TopLeft(),rGeo.nTan);
+    if (rGeo.nShearAngle!=0) ShearPoly(aPol,rRect.TopLeft(),rGeo.nTan);
     if (rGeo.nRotationAngle!=0) RotatePoly(aPol,rRect.TopLeft(),rGeo.nSin,rGeo.nCos);
     return aPol;
 }
@@ -512,7 +512,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
     }
     if (nShW<-SDRMAXSHEAR) nShW=-SDRMAXSHEAR; // limit ShearWinkel (shear angle) to +/- 89.00 deg
     if (nShW>SDRMAXSHEAR)  nShW=SDRMAXSHEAR;
-    rGeo.nShearWink=nShW;
+    rGeo.nShearAngle=nShW;
     rGeo.RecalcTan();
     Point aRU(aPt0);
     aRU.X()+=nWdt;
-- 
cgit