diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-18 17:43:46 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-19 09:59:43 +0100 |
| commit | 37429f2690a96491ad0e4fa2a04f2fa88a66da87 (patch) | |
| tree | 9963c1f531f22306edaf2ce8b41d5636f5e191f3 /svx/source/dialog | |
| parent | 0afd2d3bfa9d55249ffd1408681ff04decf2d8fa (diff) | |
Use M_PI* instead of F_PI*
Change-Id: Ie2b7a1c74fc516781a17a20157b8217bc41e383d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125504
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 16 | ||||
| -rw-r--r-- | svx/source/dialog/frmsel.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index d2aab7f954d7..504e65e6c7a6 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -299,7 +299,7 @@ void Svx3DLightControl::Construct2() basegfx::B3DPolygon a3DCircle(basegfx::utils::createB3DPolygonFromB2DPolygon(a2DCircle)); basegfx::B3DHomMatrix aTransform; - aTransform.rotate(F_PI2, 0.0, 0.0); + aTransform.rotate(M_PI_2, 0.0, 0.0); aTransform.translate(0.0, -RADIUS_LAMP_PREVIEW_SIZE, 0.0); a3DCircle.transform(aTransform); @@ -314,7 +314,7 @@ void Svx3DLightControl::Construct2() a2DHalfCircle.append(basegfx::B2DPoint(RADIUS_LAMP_PREVIEW_SIZE, 0.0)); a2DHalfCircle.append(basegfx::B2DPoint(RADIUS_LAMP_PREVIEW_SIZE, -RADIUS_LAMP_PREVIEW_SIZE)); a2DHalfCircle.append(basegfx::utils::createPolygonFromEllipseSegment( - basegfx::B2DPoint(0.0, 0.0), RADIUS_LAMP_PREVIEW_SIZE, RADIUS_LAMP_PREVIEW_SIZE, F_2PI - F_PI2, F_PI2)); + basegfx::B2DPoint(0.0, 0.0), RADIUS_LAMP_PREVIEW_SIZE, RADIUS_LAMP_PREVIEW_SIZE, F_2PI - M_PI_2, M_PI_2)); basegfx::B3DPolygon a3DHalfCircle(basegfx::utils::createB3DPolygonFromB2DPolygon(a2DHalfCircle)); // create object for it @@ -609,14 +609,14 @@ bool Svx3DLightControl::MouseMove(const MouseEvent& rMEvt) } // cut vertical - if(fNewRotX < -F_PI2) + if(fNewRotX < -M_PI_2) { - fNewRotX = -F_PI2; + fNewRotX = -M_PI_2; } - if(fNewRotX > F_PI2) + if(fNewRotX > M_PI_2) { - fNewRotX = F_PI2; + fNewRotX = M_PI_2; } SetRotation(fNewRotX, fNewRotY, mfSaveActionStartRotZ); @@ -712,7 +712,7 @@ void Svx3DLightControl::GetPosition(double& rHor, double& rVer) { basegfx::B3DVector aDirection(GetLightDirection(maSelectedLight)); aDirection.normalize(); - rHor = basegfx::rad2deg(atan2(-aDirection.getX(), -aDirection.getZ()) + F_PI); // 0..360.0 + rHor = basegfx::rad2deg(atan2(-aDirection.getX(), -aDirection.getZ()) + M_PI); // 0..360.0 rVer = basegfx::rad2deg(atan2(aDirection.getY(), aDirection.getXZLength())); // -90.0..90.0 } if(IsGeometrySelected()) @@ -727,7 +727,7 @@ void Svx3DLightControl::SetPosition(double fHor, double fVer) if(IsSelectionValid()) { // set selected light's direction - fHor = basegfx::deg2rad(fHor) - F_PI; // -PI..PI + fHor = basegfx::deg2rad(fHor) - M_PI; // -PI..PI fVer = basegfx::deg2rad(fVer); // -PI2..PI2 basegfx::B3DVector aDirection(cos(fVer) * -sin(fHor), sin(fVer), cos(fVer) * -cos(fHor)); aDirection.normalize(); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 7871ae95249a..b2ab3d7ce523 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -425,7 +425,7 @@ void FrameSelectorImpl::InitBorderGeometry() basegfx::fround(aCellRange.getMinX()), basegfx::fround(aCellRange.getMinY()), basegfx::fround(aCellRange.getMaxX()), basegfx::fround(aCellRange.getMaxY())); const double fHorDiagAngle(atan2(fabs(aCellRange.getHeight()), fabs(aCellRange.getWidth()))); - const double fVerDiagAngle(fHorDiagAngle > 0.0 ? F_PI2 - fHorDiagAngle : 0.0); + const double fVerDiagAngle(fHorDiagAngle > 0.0 ? M_PI_2 - fHorDiagAngle : 0.0); const tools::Long nDiagFocusOffsX(basegfx::fround(-mnFocusOffs / tan(fHorDiagAngle) + mnFocusOffs / sin(fHorDiagAngle))); const tools::Long nDiagFocusOffsY(basegfx::fround(-mnFocusOffs / tan(fVerDiagAngle) + mnFocusOffs / sin(fVerDiagAngle))); |