[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Oct 15 00:01:44 PDT 2014
include/svx/svdhdl.hxx | 2
include/svx/svdtrans.hxx | 8 +-
sc/source/core/data/drwlayer.cxx | 2
sc/source/filter/html/htmlexp2.cxx | 2
sc/source/ui/app/client.cxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/ui/docshell/sdclient.cxx | 2
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 4 -
svx/source/sdr/contact/viewcontactofgraphic.cxx | 6 +-
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 12 ++--
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 2
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svdedtv2.cxx | 10 +--
svx/source/svdraw/svdhdl.cxx | 14 ++--
svx/source/svdraw/svdoashp.cxx | 40 +++++++-------
svx/source/svdraw/svdocirc.cxx | 30 +++++-----
svx/source/svdraw/svdograf.cxx | 16 ++---
svx/source/svdraw/svdomeas.cxx | 8 +-
svx/source/svdraw/svdopath.cxx | 16 ++---
svx/source/svdraw/svdorect.cxx | 20 +++----
svx/source/svdraw/svdotext.cxx | 38 ++++++-------
svx/source/svdraw/svdotxat.cxx | 2
svx/source/svdraw/svdotxdr.cxx | 10 +--
svx/source/svdraw/svdotxed.cxx | 4 -
svx/source/svdraw/svdotxtr.cxx | 30 +++++-----
svx/source/svdraw/svdouno.cxx | 6 +-
svx/source/svdraw/svdtrans.cxx | 14 ++--
svx/source/svdraw/svdview.cxx | 2
svx/source/table/viewcontactoftableobj.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 4 -
34 files changed, 160 insertions(+), 160 deletions(-)
New commits:
commit da77897d1923137574fd3a5a65921a5dbaf0aafc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Oct 15 07:53:32 2014 +0200
nDrehWink -> nRotationAngle
Change-Id: I33ca88f38210140931b12a05e426d1373243156e
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 334ad31..adaff2e 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -156,7 +156,7 @@ protected:
SdrHdlKind eKind;
- long nDrehWink; // Handles bzw. Mauszeiger drehen
+ long nRotationAngle; // Handles bzw. Mauszeiger drehen
sal_uInt32 nObjHdlNum; // wird von der MarkView benoetigt
sal_uInt32 nPolyNum; // Polygonpunktes
sal_uInt32 nPPntNum; // Punktnummer des Polygons
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index d29ab1f..163e2f2 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -197,14 +197,14 @@ long GetLen(const Point& rPnt);
class GeoStat { // Geometrischer Status fuer ein Rect
public:
- long nDrehWink;
+ long nRotationAngle;
long nShearWink;
double nTan; // tan(nShearWink)
- double nSin; // sin(nDrehWink)
- double nCos; // cos(nDrehWink)
+ double nSin; // sin(nRotationAngle)
+ double nCos; // cos(nRotationAngle)
bool bMirrored; // Horizontal gespiegelt? (ni)
public:
- GeoStat(): nDrehWink(0),nShearWink(0),nTan(0.0),nSin(0.0),nCos(1.0),bMirrored(false) {}
+ GeoStat(): nRotationAngle(0),nShearWink(0),nTan(0.0),nSin(0.0),nCos(1.0),bMirrored(false) {}
void RecalcSinCos();
void RecalcTan();
};
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index c6d58ef..c1d2c8f 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1955,7 +1955,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
const Graphic& rGraphic = pGrafObj->GetGraphic();
// Drehung rueckgaengig
- if ( rGeo.nDrehWink )
+ if ( rGeo.nRotationAngle )
RotatePoint( aRelPoint, aLogRect.TopLeft(), -rGeo.nSin, rGeo.nCos );
// Spiegelung rueckgaengig
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index d7cc9c4..f361a5a 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -137,7 +137,7 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
{
const SdrGrafObj* pSGO = (SdrGrafObj*)pObject;
const SdrGrafObjGeoData* pGeo = (SdrGrafObjGeoData*)pSGO->GetGeoData();
- sal_uInt16 nMirrorCase = (pGeo->aGeo.nDrehWink == 18000 ?
+ sal_uInt16 nMirrorCase = (pGeo->aGeo.nRotationAngle == 18000 ?
( pGeo->bMirrored ? 3 : 4 ) : ( pGeo->bMirrored ? 2 : 1 ));
bool bHMirr = ( ( nMirrorCase == 2 ) || ( nMirrorCase == 4 ) );
bool bVMirr = ( ( nMirrorCase == 3 ) || ( nMirrorCase == 4 ) );
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 080b0f3..8f33f78 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -158,7 +158,7 @@ void ScClient::ObjectAreaChanged()
// #i118524# if sheared/rotated, center to non-rotated LogicRect
pDrawObj->setSuppressSetVisAreaSize(true);
- if(pDrawObj->GetGeoStat().nDrehWink || pDrawObj->GetGeoStat().nShearWink)
+ if(pDrawObj->GetGeoStat().nRotationAngle || pDrawObj->GetGeoStat().nShearWink)
{
pDrawObj->SetLogicRect( aNewRectangle );
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index b8d3337..ed3c1ad 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -990,7 +990,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
SdrGrafObjGeoData* pGeoData = (SdrGrafObjGeoData*) pGrafObj->GetGeoData();
// Undo rotation
- if ( rGeo.nDrehWink )
+ if ( rGeo.nRotationAngle )
RotatePoint( aRelPoint, rRect.TopLeft(), -rGeo.nSin, rGeo.nCos );
// Undo mirroring
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx
index 0976289..9166417 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -116,7 +116,7 @@ void Client::ObjectAreaChanged()
// #i118524# if sheared/rotated, center to non-rotated LogicRect
pObj->setSuppressSetVisAreaSize(true);
- if(pObj->GetGeoStat().nDrehWink || pObj->GetGeoStat().nShearWink)
+ if(pObj->GetGeoStat().nRotationAngle || pObj->GetGeoStat().nShearWink)
{
pObj->SetLogicRect( aNewRectangle );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index a49a877..24f6942 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -219,10 +219,10 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom
// if rotated, copy GeoStat, too.
const GeoStat& rSourceGeo = pCustoObj->GetGeoStat();
- if ( rSourceGeo.nDrehWink )
+ if ( rSourceGeo.nRotationAngle )
{
pTextObj->NbcRotate(
- pCustoObj->GetSnapRect().Center(), rSourceGeo.nDrehWink,
+ pCustoObj->GetSnapRect().Center(), rSourceGeo.nRotationAngle,
rSourceGeo.nSin, rSourceGeo.nCos);
}
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index f4896db..2b62285 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -334,8 +334,8 @@ namespace sdr
// look for mirroring
const GeoStat& rGeoStat(GetGrafObject().GetGeoStat());
- const sal_Int32 nDrehWink(rGeoStat.nDrehWink);
- const bool bRota180(18000 == nDrehWink);
+ const sal_Int32 nRotationAngle(rGeoStat.nRotationAngle);
+ const bool bRota180(18000 == nRotationAngle);
const bool bMirrored(GetGrafObject().IsMirrored());
const sal_uInt16 nMirrorCase(bRota180 ? (bMirrored ? 3 : 4) : (bMirrored ? 2 : 1));
bool bHMirr((2 == nMirrorCase ) || (4 == nMirrorCase));
@@ -360,7 +360,7 @@ namespace sdr
// fill object matrix
const double fShearX(rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0);
- const double fRotate(nDrehWink ? (36000 - nDrehWink) * F_PI18000 : 0.0);
+ const double fRotate(nRotationAngle ? (36000 - nRotationAngle) * F_PI18000 : 0.0);
const basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(),
fShearX, fRotate,
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index e5c84ed..3f013d95 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -79,7 +79,7 @@ namespace sdr
basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(),
rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0,
- rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0,
+ rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0,
aObjectRange.getMinX(), aObjectRange.getMinY()));
// calculate corner radius
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index d595917..79a849c 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -66,7 +66,7 @@ namespace sdr
basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(),
rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0,
- rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0,
+ rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0,
aObjectRange.getMinX(), aObjectRange.getMinY()));
// create primitive data
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 88421e5..bf6a31e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -60,7 +60,7 @@ namespace sdr
const GeoStat& rGeoStat(GetCustomShapeObj().GetGeoStat());
// only correct when rotation and/or shear is used
- if(rGeoStat.nShearWink || rGeoStat.nDrehWink )
+ if(rGeoStat.nShearWink || rGeoStat.nRotationAngle )
{
// text range needs to be corrected by
// aObjectRange.getCenter() - aRotObjectRange.getCenter() since it's
@@ -79,9 +79,9 @@ namespace sdr
aRotMatrix.shearX(tan((36000 - rGeoStat.nShearWink) * F_PI18000));
}
- if(rGeoStat.nDrehWink)
+ if(rGeoStat.nRotationAngle)
{
- aRotMatrix.rotate((36000 - rGeoStat.nDrehWink) * F_PI18000);
+ aRotMatrix.rotate((36000 - rGeoStat.nRotationAngle) * F_PI18000);
}
aRotMatrix.translate(aObjectRange.getMinimum().getX(), aObjectRange.getMinimum().getY());
@@ -177,7 +177,7 @@ namespace sdr
const double fExtraTextRotation(GetCustomShapeObj().GetExtraTextRotation());
const GeoStat& rGeoStat(GetCustomShapeObj().GetGeoStat());
- if(rGeoStat.nShearWink || rGeoStat.nDrehWink || !basegfx::fTools::equalZero(fExtraTextRotation))
+ if(rGeoStat.nShearWink || rGeoStat.nRotationAngle || !basegfx::fTools::equalZero(fExtraTextRotation))
{
if(aObjectRange != aTextRange)
{
@@ -202,9 +202,9 @@ namespace sdr
aTextBoxMatrix.shearX(tan((36000 - rGeoStat.nShearWink) * F_PI18000));
}
- if(rGeoStat.nDrehWink)
+ if(rGeoStat.nRotationAngle)
{
- aTextBoxMatrix.rotate((36000 - rGeoStat.nDrehWink) * F_PI18000);
+ aTextBoxMatrix.rotate((36000 - rGeoStat.nRotationAngle) * F_PI18000);
}
// give text it's target position
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index ef7314f..1d7dbaf 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -73,7 +73,7 @@ namespace sdr
// create object matrix
const GeoStat& rGeoStat(GetOle2Obj().GetGeoStat());
const double fShearX(rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0);
- const double fRotate(rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0);
+ const double fRotate(rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0);
return basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(),
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index c95a47b..c23c26e 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -115,7 +115,7 @@ namespace sdr
aObjectMatrix = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
fScaleX, fScaleY,
rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0,
- rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0,
+ rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0,
aObjectRange.getMinX(), aObjectRange.getMinY());
// ceate unit polygon from object's absolute path
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index 2ab0173..ceabecd 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -67,7 +67,7 @@ namespace sdr
basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(),
rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0,
- rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0,
+ rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0,
aObjectRange.getMinX(), aObjectRange.getMinY()));
// calculate corner radius
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index a5b671c..687ed7d 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -3861,7 +3861,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
// // core geometry stuff a vertical mirror is expressed as 180 degree rotation. All
// // this can be removed again when aw080 will have cleaned up the old
// // (non-)transformation mess in the core.
- // if(18000 == pObj->GetGeoStat().nDrehWink)
+ // if(18000 == pObj->GetGeoStat().nRotationAngle)
// {
// // old notation of vertical mirror, need to correct diffs since both rects
// // are rotated by 180 degrees
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index b102d42..ae29e95 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1580,10 +1580,10 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
// if rotated, copy GeoStat, too.
const GeoStat& rSourceGeo = pCustomShape->GetGeoStat();
- if(rSourceGeo.nDrehWink)
+ if(rSourceGeo.nRotationAngle)
{
pTextObj->NbcRotate(
- pCustomShape->GetSnapRect().Center(), rSourceGeo.nDrehWink,
+ pCustomShape->GetSnapRect().Center(), rSourceGeo.nRotationAngle,
rSourceGeo.nSin, rSourceGeo.nCos);
}
@@ -2037,7 +2037,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
aGeoStat.RecalcTan();
}
- if(aGeoStat.nDrehWink)
+ if(aGeoStat.nRotationAngle)
{
aGeoStat.RecalcSinCos();
}
@@ -2056,9 +2056,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
pCandidate->NbcShear(aLogicRect.TopLeft(), aGeoStat.nShearWink, aGeoStat.nTan, false);
}
- if(aGeoStat.nDrehWink)
+ if(aGeoStat.nRotationAngle)
{
- pCandidate->NbcRotate(aLogicRect.TopLeft(), aGeoStat.nDrehWink, aGeoStat.nSin, aGeoStat.nCos);
+ pCandidate->NbcRotate(aLogicRect.TopLeft(), aGeoStat.nRotationAngle, aGeoStat.nSin, aGeoStat.nCos);
}
SdrMark aNewMark(pCandidate, pPV);
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 74f2ec0..ac6b727 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -274,7 +274,7 @@ SdrHdl::SdrHdl():
pPV(NULL),
pHdlList(NULL),
eKind(HDL_MOVE),
- nDrehWink(0),
+ nRotationAngle(0),
nObjHdlNum(0),
nPolyNum(0),
nPPntNum(0),
@@ -293,7 +293,7 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
pHdlList(NULL),
aPos(rPnt),
eKind(eNewKind),
- nDrehWink(0),
+ nRotationAngle(0),
nObjHdlNum(0),
nPolyNum(0),
nPPntNum(0),
@@ -335,9 +335,9 @@ void SdrHdl::SetMoveOutside( bool bMoveOutside )
void SdrHdl::SetDrehWink(long n)
{
- if(nDrehWink != n)
+ if(nRotationAngle != n)
{
- nDrehWink = n;
+ nRotationAngle = n;
// create new display
Touch();
@@ -811,7 +811,7 @@ Pointer SdrHdl::GetPointer() const
}
} else {
// When resizing rotated rectangles, rotate the mouse cursor slightly, too
- if (bSize && nDrehWink!=0) {
+ if (bSize && nRotationAngle!=0) {
long nHdlWink=0;
switch (eKind) {
case HDL_LWRGT: nHdlWink=31500; break;
@@ -825,7 +825,7 @@ Pointer SdrHdl::GetPointer() const
default:
break;
}
- nHdlWink+=nDrehWink+2249; // a little bit more (for rounding)
+ nHdlWink+=nRotationAngle+2249; // a little bit more (for rounding)
while (nHdlWink<0) nHdlWink+=36000;
while (nHdlWink>=36000) nHdlWink-=36000;
nHdlWink/=4500;
@@ -1669,7 +1669,7 @@ void ImpTextframeHdl::CreateB2dIAObject()
fTransparence,
3.0,
3.0,
- nDrehWink * -F_PI18000,
+ nRotationAngle * -F_PI18000,
500,
true); // allow animation; the Handle is not shown at text edit time
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 454b73c..859e366 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1628,10 +1628,10 @@ void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, dou
// 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).
- SdrTextObj::NbcRotate( aRect.TopLeft(), -aGeo.nDrehWink, // retrieving the unrotated text object
- sin( (-aGeo.nDrehWink) * F_PI18000 ),
- cos( (-aGeo.nDrehWink) * F_PI18000 ) );
- aGeo.nDrehWink = 0; // resetting aGeo data
+ SdrTextObj::NbcRotate( aRect.TopLeft(), -aGeo.nRotationAngle, // retrieving the unrotated text object
+ sin( (-aGeo.nRotationAngle) * F_PI18000 ),
+ cos( (-aGeo.nRotationAngle) * F_PI18000 ) );
+ aGeo.nRotationAngle = 0; // resetting aGeo data
aGeo.RecalcSinCos();
long nW = (long)( fObjectRotation * 100 ); // applying our object rotation
@@ -1690,7 +1690,7 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
SdrTextObj::NbcMirror( rRef1, rRef2 );
// update fObjectRotation
- long nTextObjRotation = aGeo.nDrehWink;
+ long nTextObjRotation = aGeo.nRotationAngle;
double fWink = nTextObjRotation;
fWink /= 100.0;
@@ -1720,7 +1720,7 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool
SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
// updating fObjectRotation
- long nTextObjRotation = aGeo.nDrehWink;
+ long nTextObjRotation = aGeo.nRotationAngle;
double fWink = nTextObjRotation;
fWink /= 100.0;
@@ -1758,7 +1758,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
case 3: aPt=aRect.LeftCenter(); aPt.X()-=nWdt; break;
}
if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
aGP.SetPercent(false);
@@ -1803,7 +1803,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
long nShearWink = aGeo.nShearWink;
double fTan = aGeo.nTan;
- if ( aGeo.nDrehWink || nShearWink || bMirroredX || bMirroredY )
+ if ( aGeo.nRotationAngle || nShearWink || bMirroredX || bMirroredY )
{
Polygon aPoly( aRect );
if( nShearWink )
@@ -1812,8 +1812,8 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
for (sal_uInt16 i=0; i<nPointCount; i++)
ShearPoint(aPoly[i],aRect.Center(), fTan, false );
}
- if ( aGeo.nDrehWink )
- aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
+ if ( aGeo.nRotationAngle )
+ aPoly.Rotate( aRect.Center(), aGeo.nRotationAngle / 10 );
Rectangle aBoundRect( aPoly.GetBoundRect() );
sal_Int32 nXDiff = aBoundRect.Left() - aRect.Left();
@@ -1987,11 +1987,11 @@ void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect )
GeoStat aGeoStat( GetGeoStat() );
if ( aNewRect.TopLeft()!= aRect.TopLeft() &&
- ( aGeo.nDrehWink || aGeo.nShearWink ) )
+ ( aGeo.nRotationAngle || aGeo.nShearWink ) )
{
Point aNewPos( aNewRect.TopLeft() );
if ( aGeo.nShearWink ) ShearPoint( aNewPos, aOld.TopLeft(), aGeoStat.nTan );
- if ( aGeo.nDrehWink ) RotatePoint(aNewPos, aOld.TopLeft(), aGeoStat.nSin, aGeoStat.nCos );
+ if ( aGeo.nRotationAngle ) RotatePoint(aNewPos, aOld.TopLeft(), aGeoStat.nSin, aGeoStat.nCos );
aNewRect.SetPos( aNewPos );
}
if ( aNewRect != aRect )
@@ -2456,7 +2456,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
rR.Bottom()=rR.Top()+nHgt;
}
}
- if ( aGeo.nDrehWink )
+ if ( aGeo.nRotationAngle )
{
Point aD1(rR.TopLeft());
aD1-=aR0.TopLeft();
@@ -2576,7 +2576,7 @@ void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Recta
Size aPaperMin,aPaperMax;
Rectangle aViewInit;
TakeTextAnchorRect( aViewInit );
- if ( aGeo.nDrehWink )
+ if ( aGeo.nRotationAngle )
{
Point aCenter(aViewInit.Center());
aCenter-=aViewInit.TopLeft();
@@ -2681,7 +2681,7 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
rAnchorRect.Right() = rAnchorRect.Left() + 1; // minimal width is 2
if ( rAnchorRect.GetHeight() < 2 )
rAnchorRect.Bottom() = rAnchorRect.Top() + 1; // minimal height is 2
- if ( aGeo.nDrehWink )
+ if ( aGeo.nRotationAngle )
{
Point aP( rAnchorRect.TopLeft() );
RotatePoint( aP, aRotateRef, aGeo.nSin, aGeo. nCos );
@@ -2810,7 +2810,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (eVAdj==SDRTEXTVERTADJUST_BOTTOM)
aTextPos.Y()+=nFreeHgt;
}
- if (aGeo.nDrehWink!=0)
+ if (aGeo.nRotationAngle!=0)
RotatePoint(aTextPos,aAnkRect.TopLeft(),aGeo.nSin,aGeo.nCos);
if (pAnchorRect)
@@ -2997,7 +2997,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
}
// reset object shear and rotations
- aGeo.nDrehWink = 0;
+ aGeo.nRotationAngle = 0;
aGeo.RecalcSinCos();
aGeo.nShearWink = 0;
aGeo.RecalcTan();
@@ -3064,11 +3064,11 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
GeoStat aGeoStat;
// #i78696#
- // fRotate is mathematically correct, but aGeoStat.nDrehWink is
+ // fRotate is mathematically correct, but aGeoStat.nRotationAngle is
// mirrored -> mirror value here
- aGeoStat.nDrehWink = NormAngle360(FRound(-fRotate / F_PI18000));
+ aGeoStat.nRotationAngle = NormAngle360(FRound(-fRotate / F_PI18000));
aGeoStat.RecalcSinCos();
- Rotate(Point(), aGeoStat.nDrehWink, aGeoStat.nSin, aGeoStat.nCos);
+ Rotate(Point(), aGeoStat.nRotationAngle, aGeoStat.nSin, aGeoStat.nCos);
}
// translate?
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 2a07296..32f99f0 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.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
+ bool bNeed=aGeo.nRotationAngle!=0 || aGeo.nShearWink!=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.nDrehWink)
+ if(aGeo.nShearWink || aGeo.nRotationAngle)
{
// translate top left to (0,0)
const basegfx::B2DPoint aTopLeft(aRange.getMinimum());
@@ -267,7 +267,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.nDrehWink ? (36000 - aGeo.nDrehWink) * F_PI18000 : 0.0,
+ aGeo.nRotationAngle ? (36000 - aGeo.nRotationAngle) * F_PI18000 : 0.0,
aTopLeft) * aMatrix;
// apply transformation
@@ -453,7 +453,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const
ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
}
- if (aGeo.nDrehWink)
+ if (aGeo.nRotationAngle)
{
RotatePoint(aPnt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
}
@@ -463,7 +463,7 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const
pH = new SdrHdl(aPnt,eLocalKind);
pH->SetPointNum(nPNum);
pH->SetObj((SdrObject*)this);
- pH->SetDrehWink(aGeo.nDrehWink);
+ pH->SetDrehWink(aGeo.nRotationAngle);
}
return pH;
@@ -501,7 +501,7 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
{
Point aPt(rDrag.GetNow());
- if (aGeo.nDrehWink!=0)
+ if (aGeo.nRotationAngle!=0)
RotatePoint(aPt,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
if (aGeo.nShearWink!=0)
@@ -813,10 +813,10 @@ void SdrCircObj::NbcMove(const Size& aSiz)
void SdrCircObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact)
{
- long nWink0=aGeo.nDrehWink;
- bool bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
+ long nWink0=aGeo.nRotationAngle;
+ bool bNoShearRota=(aGeo.nRotationAngle==0 && aGeo.nShearWink==0);
SdrTextObj::NbcResize(rRef,xFact,yFact);
- bNoShearRota|=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
+ bNoShearRota|=(aGeo.nRotationAngle==0 && aGeo.nShearWink==0);
if (meCircleKind!=OBJ_CIRC) {
bool bXMirr = xFact < 0;
bool bYMirr = yFact < 0;
@@ -848,8 +848,8 @@ void SdrCircObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact
nS0=-nE0;
nE0=-nTmp;
}
- nS0-=aGeo.nDrehWink;
- nE0-=aGeo.nDrehWink;
+ nS0-=aGeo.nRotationAngle;
+ nE0-=aGeo.nRotationAngle;
}
}
long nWinkDif=nE0-nS0;
@@ -892,7 +892,7 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
if (nWdt==0) aTmpPt2.X()=0;
if (nHgt==0) aTmpPt2.Y()=0;
aTmpPt2+=aCenter;
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
RotatePoint(aTmpPt1,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
RotatePoint(aTmpPt2,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
}
@@ -906,7 +906,7 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
MirrorPoint(aTmpPt1,rRef1,rRef2);
MirrorPoint(aTmpPt2,rRef1,rRef2);
// unrotate:
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
RotatePoint(aTmpPt1,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos); // -sin for reversion
RotatePoint(aTmpPt2,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos); // -sin for reversion
}
@@ -990,7 +990,7 @@ void SdrCircObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
if (meCircleKind==OBJ_SECT) {
Union(rRect,aRect.Center());
}
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
Point aDst(rRect.TopLeft());
aDst-=aRect.TopLeft();
Point aDst0(aDst);
@@ -1025,7 +1025,7 @@ void SdrCircObj::RecalcSnapRect()
void SdrCircObj::NbcSetSnapRect(const Rectangle& rRect)
{
- if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind!=OBJ_CIRC) {
+ if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=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 50abaeb..7190aa2 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -482,7 +482,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
const Size aDestSize( GetLogicRect().GetSize() );
const bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
const bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
- ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
+ ( aGeo.nRotationAngle && aGeo.nRotationAngle != 18000 ) && ( GRAPHIC_NONE != eType );
// Need cropping info earlier
( (SdrGrafObj*) this )->ImpSetAttrToGrafInfo();
@@ -497,7 +497,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
if( bMirror )
{
- sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
+ sal_uInt16 nMirrorCase = ( aGeo.nRotationAngle == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
bool bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
bool bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
@@ -505,7 +505,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
}
if( bRotate )
- aActAttr.SetRotation( sal_uInt16(aGeo.nDrehWink / 10) );
+ aActAttr.SetRotation( sal_uInt16(aGeo.nRotationAngle / 10) );
}
// Delegate to moved code in GraphicObject
@@ -658,9 +658,9 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj;
- rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 ||
- aGeo.nDrehWink % 18000 == 0 ||
- aGeo.nDrehWink % 27000 == 0;
+ rInfo.bResizeFreeAllowed = aGeo.nRotationAngle % 9000 == 0 ||
+ aGeo.nRotationAngle % 18000 == 0 ||
+ aGeo.nRotationAngle % 27000 == 0;
rInfo.bResizePropAllowed = true;
rInfo.bRotateFreeAllowed = bNoPresGrf;
@@ -1098,10 +1098,10 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const
pGrp->NbcShear(aRect.TopLeft(), aGeoStat.nShearWink, aGeoStat.nTan, false);
}
- if(aGeoStat.nDrehWink)
+ if(aGeoStat.nRotationAngle)
{
aGeoStat.RecalcSinCos();
- pGrp->NbcRotate(aRect.TopLeft(), aGeoStat.nDrehWink, aGeoStat.nSin, aGeoStat.nCos);
+ pGrp->NbcRotate(aRect.TopLeft(), aGeoStat.nRotationAngle, aGeoStat.nSin, aGeoStat.nCos);
}
}
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index dd3998b..ebec5c6 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -714,8 +714,8 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
aTextPos.Y()-=aTextSize2.Width();
}
}
- if (aMPol.nTextWink!=aGeo.nDrehWink) {
- ((SdrMeasureObj*)this)->aGeo.nDrehWink=aMPol.nTextWink;
+ if (aMPol.nTextWink!=aGeo.nRotationAngle) {
+ ((SdrMeasureObj*)this)->aGeo.nRotationAngle=aMPol.nTextWink;
((SdrMeasureObj*)this)->aGeo.RecalcSinCos();
}
RotatePoint(aTextPos,aPt1b,aMPol.nLineSin,aMPol.nLineCos);
@@ -724,8 +724,8 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
rRect.Justify();
((SdrMeasureObj*)this)->aRect=rRect;
- if (aMPol.nTextWink!=aGeo.nDrehWink) {
- ((SdrMeasureObj*)this)->aGeo.nDrehWink=aMPol.nTextWink;
+ if (aMPol.nTextWink!=aGeo.nRotationAngle) {
+ ((SdrMeasureObj*)this)->aGeo.nRotationAngle=aMPol.nTextWink;
((SdrMeasureObj*)this)->aGeo.RecalcSinCos();
}
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 7a20ab0..3f75413 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1712,7 +1712,7 @@ void SdrPathObj::ImpForceLineWink()
const Point aPoint1(FRound(aB2DPoint1.getX()), FRound(aB2DPoint1.getY()));
const Point aDelt(aPoint1 - aPoint0);
- aGeo.nDrehWink=GetAngle(aDelt);
+ aGeo.nRotationAngle=GetAngle(aDelt);
aGeo.nShearWink=0;
aGeo.RecalcSinCos();
aGeo.RecalcTan();
@@ -2415,7 +2415,7 @@ void SdrPathObj::NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2)
void SdrPathObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
{
- if(!aGeo.nDrehWink)
+ if(!aGeo.nRotationAngle)
{
rRect = GetSnapRect();
}
@@ -2893,17 +2893,17 @@ bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DP
}
else
{
- if(aGeo.nShearWink || aGeo.nDrehWink)
+ if(aGeo.nShearWink || aGeo.nRotationAngle)
{
// get rotate and shear in drawingLayer notation
- fRotate = aGeo.nDrehWink * F_PI18000;
+ fRotate = aGeo.nRotationAngle * F_PI18000;
fShearX = aGeo.nShearWink * 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.rotate((36000 - aGeo.nDrehWink) * F_PI18000);
+ aObjectMatrix.rotate((36000 - aGeo.nRotationAngle) * F_PI18000);
// create inverse from it and back-transform polygon
basegfx::B2DHomMatrix aInvObjectMatrix(aObjectMatrix);
@@ -3017,7 +3017,7 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
basegfx::B2DPolyPolygon aNewPolyPolygon(rPolyPolygon);
// reset object shear and rotations
- aGeo.nDrehWink = 0;
+ aGeo.nRotationAngle = 0;
aGeo.RecalcSinCos();
aGeo.nShearWink = 0;
aGeo.RecalcTan();
@@ -3090,9 +3090,9 @@ void SdrPathObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
aTransform.rotate(fRotate);
// #i78696#
- // fRotate is mathematically correct, but aGeoStat.nDrehWink is
+ // fRotate is mathematically correct, but aGeoStat.nRotationAngle is
// mirrored -> mirror value here
- aGeo.nDrehWink = NormAngle360(FRound(-fRotate / F_PI18000));
+ aGeo.nRotationAngle = NormAngle360(FRound(-fRotate / F_PI18000));
aGeo.RecalcSinCos();
}
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 75385b4..81b12ec 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -146,7 +146,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
// these angles always relate to the top left corner of aRect
if (aGeo.nShearWink!=0) ShearXPoly(aXPoly,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotateXPoly(aXPoly,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotateXPoly(aXPoly,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
return aXPoly;
}
@@ -169,7 +169,7 @@ const XPolygon& SdrRectObj::GetXPoly() const
void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoTextFrame=!IsTextFrame();
- rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
+ rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nRotationAngle%9000==0;
rInfo.bResizePropAllowed=true;
rInfo.bRotateFreeAllowed=true;
rInfo.bRotate90Allowed =true;
@@ -290,7 +290,7 @@ basegfx::B2DPolyPolygon SdrRectObj::TakeXorPoly() const
void SdrRectObj::RecalcSnapRect()
{
long nEckRad=GetEckenradius();
- if ((aGeo.nDrehWink!=0 || aGeo.nShearWink!=0) && nEckRad!=0) {
+ if ((aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) && nEckRad!=0) {
maSnapRect=GetXPoly().GetBoundRect();
} else {
SdrTextObj::RecalcSnapRect();
@@ -334,7 +334,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const
// for a textbox is displayed at correct position
pH = new ImpTextframeHdl(aRect + GetGridOffset() );
pH->SetObj((SdrObject*)this);
- pH->SetDrehWink(aGeo.nDrehWink);
+ pH->SetDrehWink(aGeo.nRotationAngle);
break;
}
case 1:
@@ -365,14 +365,14 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const
ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
}
- if(aGeo.nDrehWink)
+ if(aGeo.nRotationAngle)
{
RotatePoint(aPnt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
}
pH = new SdrHdl(aPnt,eKind);
pH->SetObj((SdrObject*)this);
- pH->SetDrehWink(aGeo.nDrehWink);
+ pH->SetDrehWink(aGeo.nRotationAngle);
}
return pH;
@@ -407,7 +407,7 @@ bool SdrRectObj::applySpecialDrag(SdrDragStat& rDrag)
{
Point aPt(rDrag.GetNow());
- if(aGeo.nDrehWink)
+ if(aGeo.nRotationAngle)
RotatePoint(aPt,aRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
sal_Int32 nRad(aPt.X() - aRect.Left());
@@ -445,7 +445,7 @@ OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const
Point aPt(rDrag.GetNow());
// -sin for reversal
- if(aGeo.nDrehWink)
+ if(aGeo.nRotationAngle)
RotatePoint(aPt, aRect.TopLeft(), -aGeo.nSin, aGeo.nCos);
sal_Int32 nRad(aPt.X() - aRect.Left());
@@ -547,7 +547,7 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
case 3: aPt=aRect.LeftCenter(); aPt.X()-=nWdt; break;
}
if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
aGP.SetPercent(false);
@@ -573,7 +573,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
case 3: aPt=aRect.BottomLeft(); aPt.X()-=nWdt; aPt.Y()+=nWdt; break;
}
if (aGeo.nShearWink!=0) ShearPoint(aPt,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
aGP.SetPercent(false);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index bdf85d0..a84b853 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -432,7 +432,7 @@ void SdrTextObj::ImpCheckShear()
void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoTextFrame=!IsTextFrame();
- rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
+ rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nRotationAngle%9000==0;
rInfo.bResizePropAllowed=true;
rInfo.bRotateFreeAllowed=true;
rInfo.bRotate90Allowed =true;
@@ -602,10 +602,10 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix(
-rAnchorRect.Left(), -rAnchorRect.Top()));
- if(aGeo.nDrehWink)
+ if(aGeo.nRotationAngle)
{
// Unrotate!
- aMatrix.rotate(-aGeo.nDrehWink * nPi180);
+ aMatrix.rotate(-aGeo.nRotationAngle * nPi180);
}
aXorPolyPolygon.transform(aMatrix);
@@ -684,7 +684,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
if (aAnkRect.GetWidth()<2) aAnkRect.Right()=aAnkRect.Left()+1; // minimum size h and v: 2 px
if (aAnkRect.GetHeight()<2) aAnkRect.Bottom()=aAnkRect.Top()+1;
}
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
Point aTmpPt(aAnkRect.TopLeft());
RotatePoint(aTmpPt,aRotateRef,aGeo.nSin,aGeo.nCos);
aTmpPt-=aAnkRect.TopLeft();
@@ -848,7 +848,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
if (eVAdj==SDRTEXTVERTADJUST_BOTTOM)
aTextPos.Y()+=nFreeHgt;
}
- if (aGeo.nDrehWink!=0)
+ if (aGeo.nRotationAngle!=0)
RotatePoint(aTextPos,aAnkRect.TopLeft(),aGeo.nSin,aGeo.nCos);
if (pAnchorRect)
@@ -1117,7 +1117,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeXorPoly() const
{
Polygon aPol(aRect);
if (aGeo.nShearWink!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
basegfx::B2DPolyPolygon aRetval;
aRetval.append(aPol.getB2DPolygon());
@@ -1143,7 +1143,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
bool bFitToSize(IsFitToSize());
if (bFitToSize) aR=aAnchor2;
Polygon aPol(aR);
- if (aGeo.nDrehWink!=0) RotatePoly(aPol,aR.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoly(aPol,aR.TopLeft(),aGeo.nSin,aGeo.nCos);
aRetval.append(aPol.getB2DPolygon());
}
@@ -1153,10 +1153,10 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
void SdrTextObj::RecalcSnapRect()
{
- if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0) {
+ if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) {
Polygon aPol(aRect);
if (aGeo.nShearWink!=0) ShearPoly(aPol,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoly(aPol,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
maSnapRect=aPol.GetBoundRect();
} else {
maSnapRect=aRect;
@@ -1179,7 +1179,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
default: aP=aRect.Center(); break;
}
if (aGeo.nShearWink!=0) ShearPoint(aP,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoint(aP,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aP,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
return aP;
}
@@ -1596,7 +1596,7 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// get turn and shear
- double fRotate = (aGeo.nDrehWink / 100.0) * F_PI180;
+ double fRotate = (aGeo.nRotationAngle / 100.0) * F_PI180;
double fShearX = (aGeo.nShearWink / 100.0) * F_PI180;
// get aRect, this is the unrotated snaprect
@@ -1672,7 +1672,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
}
// reset object shear and rotations
- aGeo.nDrehWink = 0;
+ aGeo.nRotationAngle = 0;
aGeo.RecalcSinCos();
aGeo.nShearWink = 0;
aGeo.RecalcTan();
@@ -1732,11 +1732,11 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
GeoStat aGeoStat;
// #i78696#
- // fRotate is matematically correct, but aGeoStat.nDrehWink is
+ // fRotate is matematically correct, but aGeoStat.nRotationAngle is
// mirrored -> mirror value here
- aGeoStat.nDrehWink = NormAngle360(FRound(-fRotate / F_PI18000));
+ aGeoStat.nRotationAngle = NormAngle360(FRound(-fRotate / F_PI18000));
aGeoStat.RecalcSinCos();
- Rotate(Point(), aGeoStat.nDrehWink, aGeoStat.nSin, aGeoStat.nCos);
+ Rotate(Point(), aGeoStat.nRotationAngle, aGeoStat.nSin, aGeoStat.nCos);
}
// translate?
@@ -1842,10 +1842,10 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle(
// get outliner set up. To avoid getting a somehow rotated MetaFile,
// temporarily disable object rotation.
- sal_Int32 nAngle(aGeo.nDrehWink);
- aGeo.nDrehWink = 0L;
+ sal_Int32 nAngle(aGeo.nRotationAngle);
+ aGeo.nRotationAngle = 0L;
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutliner, aTextRect, aAnchorRect, aPaintRect, aFitXKorreg );
- aGeo.nDrehWink = nAngle;
+ aGeo.nRotationAngle = nAngle;
Rectangle aScrollFrameRect(aPaintRect);
const SfxItemSet& rSet = GetObjectItemSet();
@@ -2004,7 +2004,7 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
// Every object derived from SdrTextObj must return an "UnrotatedSnapRect"
// (->TakeUnrotatedSnapRect()) (the reference point for the rotation is the top
-// left of the rectangle (aGeo.nDrehWink)) which is the basis for anchoring
+// left of the rectangle (aGeo.nRotationAngle)) which is the basis for anchoring
// text. We then subtract the text frame margins from this rectangle, as a re-
// sult we get the anchoring area (->TakeTextAnchorRect()). Within this area, we
// calculate the anchoring point and the painting area, depending on the hori-
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 161f9f9..258db63 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -174,7 +174,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
rR.Bottom()=rR.Top()+nHgt;
}
}
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
Point aD1(rR.TopLeft());
aD1-=aR0.TopLeft();
Point aD2(aD1);
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index d7d5631..334aaae 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -53,11 +53,11 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const
case 7: aPnt=aRect.BottomRight(); eKind=HDL_LWRGT; break;
}
if (aGeo.nShearWink!=0) ShearPoint(aPnt,aRect.TopLeft(),aGeo.nTan);
- if (aGeo.nDrehWink!=0) RotatePoint(aPnt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aPnt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
if (eKind!=HDL_MOVE) {
pH=new SdrHdl(aPnt,eKind);
pH->SetObj((SdrObject*)this);
- pH->SetDrehWink(aGeo.nDrehWink);
+ pH->SetDrehWink(aGeo.nRotationAngle);
}
return pH;
}
@@ -79,7 +79,7 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const
bool bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
// Unrotate:
- if (aGeo.nDrehWink!=0) RotatePoint(aPos,aTmpRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
+ if (aGeo.nRotationAngle!=0) RotatePoint(aPos,aTmpRect.TopLeft(),-aGeo.nSin,aGeo.nCos);
// Unshear:
if (aGeo.nShearWink!=0) ShearPoint(aPos,aTmpRect.TopLeft(),-aGeo.nTan);
@@ -150,14 +150,14 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag)
{
Rectangle aNewRect(ImpDragCalcRect(rDrag));
- if(aNewRect.TopLeft() != aRect.TopLeft() && (aGeo.nDrehWink || aGeo.nShearWink))
+ if(aNewRect.TopLeft() != aRect.TopLeft() && (aGeo.nRotationAngle || aGeo.nShearWink))
{
Point aNewPos(aNewRect.TopLeft());
if(aGeo.nShearWink)
ShearPoint(aNewPos,aRect.TopLeft(),aGeo.nTan);
- if(aGeo.nDrehWink)
+ if(aGeo.nRotationAngle)
RotatePoint(aNewPos,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aNewRect.SetPos(aNewPos);
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 1f56938..4bdaa2a 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -105,7 +105,7 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
if(pOutlinerParaObject)
{
- if(aGeo.nDrehWink || IsFontwork())
+ if(aGeo.nRotationAngle || IsFontwork())
{
// only repaint here, no real objectchange
BroadcastObjectChange();
@@ -124,7 +124,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
Size aPaperMin,aPaperMax;
Rectangle aViewInit;
TakeTextAnchorRect(aViewInit);
- if (aGeo.nDrehWink!=0) {
+ if (aGeo.nRotationAngle!=0) {
Point aCenter(aViewInit.Center());
aCenter-=aViewInit.TopLeft();
Point aCenter0(aCenter);
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index e747b3e..550ce4c 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.nDrehWink!=0 || aGeo.nShearWink!=0) {
+ if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0) {
Rectangle aSR0(GetSnapRect());
long nWdt0=aSR0.Right()-aSR0.Left();
long nHgt0=aSR0.Bottom()-aSR0.Top();
@@ -102,7 +102,7 @@ void SdrTextObj::NbcSetLogicRect(const Rectangle& rRect)
long SdrTextObj::GetRotateAngle() const
{
- return aGeo.nDrehWink;
+ return aGeo.nRotationAngle;
}
long SdrTextObj::GetShearAngle(bool /*bVertical*/) const
@@ -121,7 +121,7 @@ void SdrTextObj::NbcMove(const Size& rSiz)
void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact)
{
bool bNoShearMerk=aGeo.nShearWink==0;
- bool bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0;
+ bool bRota90Merk=bNoShearMerk && aGeo.nRotationAngle % 9000 ==0;
long nHDist=GetTextLeftDistance()+GetTextRightDistance();
long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
long nTWdt0=aRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0;
@@ -142,12 +142,12 @@ void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact
}
}
- if (aGeo.nDrehWink==0 && aGeo.nShearWink==0) {
+ if (aGeo.nRotationAngle==0 && aGeo.nShearWink==0) {
ResizeRect(aRect,rRef,xFact,yFact);
if (bYMirr) {
aRect.Justify();
aRect.Move(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top());
- aGeo.nDrehWink=18000;
+ aGeo.nRotationAngle=18000;
aGeo.RecalcSinCos();
}
}
@@ -176,15 +176,15 @@ void SdrTextObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact
}
if (bRota90Merk) {
- bool bRota90=aGeo.nDrehWink % 9000 ==0;
+ bool bRota90=aGeo.nRotationAngle % 9000 ==0;
if (!bRota90) { // there's seems to be a rounding error occurring: correct it
- long a=NormAngle360(aGeo.nDrehWink);
+ long a=NormAngle360(aGeo.nRotationAngle);
if (a<4500) a=0;
else if (a<13500) a=9000;
else if (a<22500) a=18000;
else if (a<31500) a=27000;
else a=0;
- aGeo.nDrehWink=a;
+ aGeo.nRotationAngle=a;
aGeo.RecalcSinCos();
}
if (bNoShearMerk!=(aGeo.nShearWink==0)) { // correct a rounding error occurring with Shear
@@ -221,12 +221,12 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
aRect.Top()=aP.Y();
aRect.Right()=aRect.Left()+dx;
aRect.Bottom()=aRect.Top()+dy;
- if (aGeo.nDrehWink==0) {
- aGeo.nDrehWink=NormAngle360(nWink);
+ if (aGeo.nRotationAngle==0) {
+ aGeo.nRotationAngle=NormAngle360(nWink);
aGeo.nSin=sn;
aGeo.nCos=cs;
} else {
- aGeo.nDrehWink=NormAngle360(aGeo.nDrehWink+nWink);
+ aGeo.nRotationAngle=NormAngle360(aGeo.nRotationAngle+nWink);
aGeo.RecalcSinCos();
}
SetRectsDirty();
@@ -264,7 +264,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
if (bNoShearMerk &&
(rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
std::abs(rRef1.X()-rRef2.X())==std::abs(rRef1.Y()-rRef2.Y()))) {
- bRota90Merk=aGeo.nDrehWink % 9000 ==0;
+ bRota90Merk=aGeo.nRotationAngle % 9000 ==0;
}
Polygon aPol(Rect2Poly(aRect,aGeo));
sal_uInt16 i;
@@ -282,15 +282,15 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
Poly2Rect(aPol,aRect,aGeo);
if (bRota90Merk) {
- bool bRota90=aGeo.nDrehWink % 9000 ==0;
+ bool bRota90=aGeo.nRotationAngle % 9000 ==0;
if (bRota90Merk && !bRota90) { // there's seems to be a rounding error occurring: correct it
- long a=NormAngle360(aGeo.nDrehWink);
+ long a=NormAngle360(aGeo.nRotationAngle);
if (a<4500) a=0;
else if (a<13500) a=9000;
else if (a<22500) a=18000;
else if (a<31500) a=27000;
else a=0;
- aGeo.nDrehWink=a;
+ aGeo.nRotationAngle=a;
aGeo.RecalcSinCos();
}
}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index eceb1f3..aff41c4 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -324,15 +324,15 @@ void SdrUnoObj::NbcResize(const Point& rRef, const boost::rational<long>& xFact,
{
SdrRectObj::NbcResize(rRef,xFact,yFact);
- if (aGeo.nShearWink!=0 || aGeo.nDrehWink!=0)
+ if (aGeo.nShearWink!=0 || aGeo.nRotationAngle!=0)
{
// small correctures
- if (aGeo.nDrehWink>=9000 && aGeo.nDrehWink<27000)
+ if (aGeo.nRotationAngle>=9000 && aGeo.nRotationAngle<27000)
{
aRect.Move(aRect.Left()-aRect.Right(),aRect.Top()-aRect.Bottom());
}
- aGeo.nDrehWink = 0;
+ aGeo.nRotationAngle = 0;
aGeo.nShearWink = 0;
aGeo.nSin = 0.0;
aGeo.nCos = 1.0;
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 442f3e7..535383a 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -444,11 +444,11 @@ long GetLen(const Point& rPnt)
void GeoStat::RecalcSinCos()
{
- if (nDrehWink==0) {
+ if (nRotationAngle==0) {
nSin=0.0;
nCos=1.0;
} else {
- double a=nDrehWink*nPi180;
+ double a=nRotationAngle*nPi180;
nSin=sin(a);
nCos=cos(a);
}
@@ -475,24 +475,24 @@ Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo)
aPol[3]=rRect.BottomLeft();
aPol[4]=rRect.TopLeft();
if (rGeo.nShearWink!=0) ShearPoly(aPol,rRect.TopLeft(),rGeo.nTan);
- if (rGeo.nDrehWink!=0) RotatePoly(aPol,rRect.TopLeft(),rGeo.nSin,rGeo.nCos);
+ if (rGeo.nRotationAngle!=0) RotatePoly(aPol,rRect.TopLeft(),rGeo.nSin,rGeo.nCos);
return aPol;
}
void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
{
- rGeo.nDrehWink=GetAngle(rPol[1]-rPol[0]);
- rGeo.nDrehWink=NormAngle360(rGeo.nDrehWink);
+ rGeo.nRotationAngle=GetAngle(rPol[1]-rPol[0]);
+ rGeo.nRotationAngle=NormAngle360(rGeo.nRotationAngle);
// rotation successful
rGeo.RecalcSinCos();
Point aPt1(rPol[1]-rPol[0]);
- if (rGeo.nDrehWink!=0) RotatePoint(aPt1,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin to reverse rotation
+ if (rGeo.nRotationAngle!=0) RotatePoint(aPt1,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin to reverse rotation
long nWdt=aPt1.X();
Point aPt0(rPol[0]);
Point aPt3(rPol[3]-rPol[0]);
- if (rGeo.nDrehWink!=0) RotatePoint(aPt3,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin to reverse rotation
+ if (rGeo.nRotationAngle!=0) RotatePoint(aPt3,Point(0,0),-rGeo.nSin,rGeo.nCos); // -Sin to reverse rotation
long nHgt=aPt3.Y();
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 19f9834..eadfbcf 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -486,7 +486,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
// account for rotation
const GeoStat& rGeo=pTextObj->GetGeoStat();
- if (rGeo.nDrehWink!=0) RotatePoint(aTemporaryTextRelativePosition,Point(),-rGeo.nSin,rGeo.nCos); // -sin for Unrotate
+ if (rGeo.nRotationAngle!=0) RotatePoint(aTemporaryTextRelativePosition,Point(),-rGeo.nSin,rGeo.nCos); // -sin for Unrotate
// we currently don't account for ticker text
if(pActualOutDev && pActualOutDev->GetOutDevType() == OUTDEV_WINDOW)
{
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 08e2825..1468b29 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -711,7 +711,7 @@ namespace sdr
// create object matrix
const GeoStat& rGeoStat(rTableObj.GetGeoStat());
const double fShearX(rGeoStat.nShearWink ? tan((36000 - rGeoStat.nShearWink) * F_PI18000) : 0.0);
- const double fRotate(rGeoStat.nDrehWink ? (36000 - rGeoStat.nDrehWink) * F_PI18000 : 0.0);
+ const double fRotate(rGeoStat.nRotationAngle ? (36000 - rGeoStat.nRotationAngle) * F_PI18000 : 0.0);
const basegfx::B2DHomMatrix aObjectMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aObjectRange.getWidth(), aObjectRange.getHeight(), fShearX, fRotate,
aObjectRange.getMinX(), aObjectRange.getMinY()));
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 55e51bd..300cfa7 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -781,7 +781,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
// #106181# rotate snap rect before setting it
const GeoStat& aGeo = pObj->GetGeoStat();
- if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0)
+ if (aGeo.nRotationAngle!=0 || aGeo.nShearWink!=0)
{
Polygon aPol(aNewRect);
@@ -793,7 +793,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
aGeo.nTan);
ShearPoint(aOffset, Point(0,0), aGeo.nTan);
}
- if (aGeo.nDrehWink!=0)
+ if (aGeo.nRotationAngle!=0)
{
RotatePoly(aPol,
aNewRect.TopLeft(),
More information about the Libreoffice-commits
mailing list