rename DrehWink to RotationAngle

Change-Id: I4dfa2d3fa2d0c0b5029eb2cd3d724e7e6f2e3d6e

3 files changed, 29 insertions, 29 deletions

diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 33219b626f99..b0f7bf327ad1 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -199,9 +199,9 @@ SvStream& ReadRectType(SvStream& rInp, RectType& rRect)
     SWAPAREA (rRect.F);
     SWAPPOINT(rRect.Pos1);
     SWAPPOINT(rRect.Pos2);
-    rRect.Radius  =OSL_SWAPWORD(rRect.Radius  );
-    rRect.DrehWink=OSL_SWAPWORD(rRect.DrehWink);
-    rRect.Slant   =OSL_SWAPWORD(rRect.Slant   );
+    rRect.Radius        = OSL_SWAPWORD(rRect.Radius  );
+    rRect.RotationAngle = OSL_SWAPWORD(rRect.RotationAngle);
+    rRect.Slant         = OSL_SWAPWORD(rRect.Slant   );
 #endif
     return rInp;
 }
@@ -234,9 +234,9 @@ SvStream& ReadCircType(SvStream& rInp, CircType& rCirc)
     SWAPAREA (rCirc.F);
     SWAPPOINT(rCirc.Radius);
     SWAPPOINT(rCirc.Center);
-    rCirc.DrehWink =OSL_SWAPWORD(rCirc.DrehWink );
-    rCirc.StartWink=OSL_SWAPWORD(rCirc.StartWink);
-    rCirc.RelWink  =OSL_SWAPWORD(rCirc.RelWink  );
+    rCirc.RotationAngle = OSL_SWAPWORD(rCirc.RotationAngle );
+    rCirc.StartWink     = OSL_SWAPWORD(rCirc.StartWink);
+    rCirc.RelWink       = OSL_SWAPWORD(rCirc.RelWink  );
 #endif
     return rInp;
 }
@@ -248,12 +248,12 @@ SvStream& ReadTextType(SvStream& rInp, TextType& rText)
     SWAPTEXT (rText.T);
     SWAPPOINT(rText.Pos1);
     SWAPPOINT(rText.Pos2);
-    rText.TopOfs  =OSL_SWAPWORD(rText.TopOfs  );
-    rText.DrehWink=OSL_SWAPWORD(rText.DrehWink);
-    rText.BoxSlant=OSL_SWAPWORD(rText.BoxSlant);
-    rText.BufSize =OSL_SWAPWORD(rText.BufSize );
+    rText.TopOfs        = OSL_SWAPWORD(rText.TopOfs  );
+    rText.RotationAngle = OSL_SWAPWORD(rText.RotationAngle);
+    rText.BoxSlant      = OSL_SWAPWORD(rText.BoxSlant);
+    rText.BufSize       = OSL_SWAPWORD(rText.BufSize );
     SWAPPOINT(rText.FitSize);
-    rText.FitBreit=OSL_SWAPWORD(rText.FitBreit);
+    rText.FitBreit      = OSL_SWAPWORD(rText.FitBreit);
 #endif
     rText.Buffer=NULL;
     return rInp;
@@ -266,8 +266,8 @@ SvStream& ReadBmapType(SvStream& rInp, BmapType& rBmap)
     SWAPAREA (rBmap.F);
     SWAPPOINT(rBmap.Pos1);
     SWAPPOINT(rBmap.Pos2);
-    rBmap.DrehWink=OSL_SWAPWORD(rBmap.DrehWink);
-    rBmap.Slant   =OSL_SWAPWORD(rBmap.Slant   );
+    rBmap.RotationAngle = OSL_SWAPWORD(rBmap.RotationAngle);
+    rBmap.Slant         = OSL_SWAPWORD(rBmap.Slant   );
     SWAPPOINT(rBmap.PixSize);
 #endif
     return rInp;
@@ -443,7 +443,7 @@ void RectType::Draw(OutputDevice& rOut)
 {
     if (L.LMuster!=0) L.LMuster=1; // no line separator here, only on or off
     SetArea(F,rOut);
-    if (DrehWink==0) {
+    if (RotationAngle==0) {
     if ((F.FBFarbe & 0x38)==0 || Radius!=0) {
             SetLine(L,rOut);
             rOut.DrawRect(Rectangle(Pos1.x,Pos1.y,Pos2.x,Pos2.y),Radius,Radius);
@@ -459,8 +459,8 @@ void RectType::Draw(OutputDevice& rOut)
         Point  aPts[4];
         sal_uInt16 i;
         double sn,cs;
-        sn=sin(double(DrehWink)*3.14159265359/18000);
-        cs=cos(double(DrehWink)*3.14159265359/18000);
+        sn=sin(double(RotationAngle)*3.14159265359/18000);
+        cs=cos(double(RotationAngle)*3.14159265359/18000);
         aPts[0]=Point(Pos1.x,Pos1.y);
         aPts[1]=Point(Pos2.x,Pos1.y);
         aPts[2]=Point(Pos2.x,Pos2.y);
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index cb93d7965bc1..a099f2462571 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -188,8 +188,8 @@ public:
     PointType       Pos1;      // lower left corner = reference point
     PointType       Pos2;      // right corner
     sal_Int16       Radius;    // radius of corner
-    sal_uInt16      DrehWink;  //  315...<45
-    sal_uInt16      Slant;     // >270...<90
+    sal_uInt16      RotationAngle;  //  315...<45
+    sal_uInt16      Slant;          // >270...<90
     friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect);
     virtual void Draw(OutputDevice& rOut) SAL_OVERRIDE;
 };
@@ -235,7 +235,7 @@ public:
     ObjAreaType     F;         // not for arcs (circly & ellips)
     PointType       Center;    // center
     PointType       Radius;    // radius
-    sal_uInt16      DrehWink;  // only ellipses
+    sal_uInt16      RotationAngle;  // only ellipses
     sal_uInt16      StartWink; // and not for full circles
     sal_uInt16      RelWink;   // and full ellipses
     friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc);
@@ -255,7 +255,7 @@ public:
     PointType   Pos1;        // reference point (upper left)
     PointType   Pos2;        //                 (lower right)
     sal_Int16   TopOfs;      // from upper side to start of text (future for vJustify)
-    sal_uInt16  DrehWink;    //    0...<360
+    sal_uInt16  RotationAngle;    //    0...<360
     sal_uInt16  BoxSlant;    // >270...<90 (only Box)
     sal_uInt16  BufSize;     // size of buffer for Load, Save, Copy etc.
     sal_uInt16  BufLo,BufHi; // (UCHAR*) pointer to Textbuffer << ShortArr, otherwise DWord-Allign needed
@@ -282,7 +282,7 @@ public:
     ObjAreaType F;            // colour and pattern of first plane bitmap
     PointType   Pos1;
     PointType   Pos2;
-    sal_uInt16  DrehWink;     //  315...<45   (future)
+    sal_uInt16  RotationAngle;//  315...<45   (future)
     sal_uInt16  Slant;        // >270...<90   (future)
     UCHAR       Filename[80]; // path
     PointType   PixSize;      // size in Pixel (0 for vector)
@@ -297,7 +297,7 @@ public:
     BmapType()
         : Flags(0)
         , Reserve(0)
-        , DrehWink(0)
+        , RotationAngle(0)
         , Slant(0)
         , Format(NoGraf)
         , nPlanes(0)
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index e8c31aaae39c..7522420d70ef 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -867,10 +867,10 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType&
 
 // Start of DrawText.Pas
 
-void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uInt16 DrehWink,
+void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uInt16 RotationAngle,
               sal_uInt16 FitXMul, sal_uInt16 FitXDiv, sal_uInt16 FitYMul, sal_uInt16 FitYDiv)
 {
-    SetTextContext(rOut,T,UpcasePossible(c),DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv);
+    SetTextContext(rOut,T,UpcasePossible(c),RotationAngle,FitXMul,FitXDiv,FitYMul,FitYDiv);
     if ((T.Schnitt & TextKaptBit)!=0 && UpcasePossible(c)) c=Upcase(c);
     OUString s(reinterpret_cast<const sal_Char*>(&c), 1,
         RTL_TEXTENCODING_IBM_437);
@@ -917,12 +917,12 @@ void TextType::Draw(OutputDevice& rOut)
     bool LineFit=((Flags & TextFitZBit)!=0);  // FitSize.x=0? or flags -> strech each line
     if (TextFit && FitSize.x==0) LineFit=true;
 
-    if (DrehWink==0) {
+    if (RotationAngle==0) {
         sn=0.0;
         cs=1.0;
     } else {
-        sn=sin(double(DrehWink)*3.14159265359/18000);
-        cs=cos(double(DrehWink)*3.14159265359/18000);
+        sn=sin(double(RotationAngle)*3.14159265359/18000);
+        cs=cos(double(RotationAngle)*3.14159265359/18000);
     }
 
     T1=T; Index1=0; yPos=0; xPos=0;
@@ -981,8 +981,8 @@ void TextType::Draw(OutputDevice& rOut)
                     Pos.x=short(xp1);
                     Pos.y=short(yp1);
 
-                    if (DrehWink!=0) RotatePoint(Pos,Pos1.x,Pos1.y,sn,cs);
-                    DrawChar(rOut,c,T2,Pos,DrehWink,FitXMul,FitXDiv,FitYMul,FitYDiv);
+                    if (RotationAngle!=0) RotatePoint(Pos,Pos1.x,Pos1.y,sn,cs);
+                    DrawChar(rOut,c,T2,Pos,RotationAngle,FitXMul,FitXDiv,FitYMul,FitYDiv);
                     i++;
                 } // while i<=l
                 yPos=yPos0+LF;