diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-21 08:56:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-21 08:56:29 +0200 |
| commit | 43327878920f424f8bac1114bee51c54609796c5 (patch) | |
| tree | 7e1080d97a090ab70bb1054ad17c3601d60bbb0c /svx/source/customshapes | |
| parent | 42a05b4b2aa980cc8443813e6ab903034f9f4dbc (diff) | |
nShearWink -> nShearAngle
Change-Id: I122f16783db4025b9335ed82a12f051516d98d4c
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 4 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index a3810f05c31c..1e0e818eb6ed 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1177,7 +1177,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r rReturnPosition = GetPoint( aHandle.aPosition, true, false ); } const GeoStat aGeoStat( static_cast<SdrObjCustomShape*>(pCustomShapeObj)->GetGeoStat() ); - if ( aGeoStat.nShearWink ) + if ( aGeoStat.nShearAngle ) { double nTan = aGeoStat.nTan; if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV)) @@ -1222,7 +1222,7 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex RotatePoint( aP, Point( aLogicRect.GetWidth() / 2, aLogicRect.GetHeight() / 2 ), sin( a ), cos( a ) ); } const GeoStat aGeoStat( static_cast<SdrObjCustomShape*>(pCustomShapeObj)->GetGeoStat() ); - if ( aGeoStat.nShearWink ) + if ( aGeoStat.nShearAngle ) { double nTan = -aGeoStat.nTan; if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV)) diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 2613d6537500..2d26c302260a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -315,16 +315,16 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() Rectangle aRect( pSdrObjCustomShape->GetSnapRect() ); const GeoStat& rGeoStat = static_cast<SdrObjCustomShape*>(pSdrObjCustomShape)->GetGeoStat(); - if ( rGeoStat.nShearWink ) + if ( rGeoStat.nShearAngle ) { - long nShearWink = rGeoStat.nShearWink; + long nShearAngle = rGeoStat.nShearAngle; double nTan = rGeoStat.nTan; if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV)) { - nShearWink = -nShearWink; + nShearAngle = -nShearAngle; nTan = -nTan; } - pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, false); + pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearAngle, nTan, false); } if( !bPostRotateAngle && nRotateAngle ) { @@ -404,16 +404,16 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom bool bFlipH = aCustomShape2d.IsFlipHorz(); const GeoStat& rGeoStat = static_cast<SdrObjCustomShape*>(pSdrObjCustomShape)->GetGeoStat(); - if ( rGeoStat.nShearWink ) + if ( rGeoStat.nShearAngle ) { - long nShearWink = rGeoStat.nShearWink; + long nShearAngle = rGeoStat.nShearAngle; double nTan = rGeoStat.nTan; if ((bFlipV&&!bFlipH )||(bFlipH&&!bFlipV)) { - nShearWink = -nShearWink; + nShearAngle = -nShearAngle; nTan = -nTan; } - pObj->Shear( aRect.Center(), nShearWink, nTan, false); + pObj->Shear( aRect.Center(), nShearAngle, nTan, false); } sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle(); if( nRotateAngle ) |