diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-02-26 10:18:39 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-02-26 10:12:29 +0100 |
| commit | 3caf379f1c6398548c65bb7a83e3911d9a8bc444 (patch) | |
| tree | c2068e498094b99865ed8e59b6b0f65fee908683 /filter | |
| parent | b8f83e285af000ed1ebf211c2021cc065724ea37 (diff) | |
svdtrans: nPi -> M_PI; nPi180 -> F_PI18000 to remove duplicates
Change-Id: Ia2c103a5b530d007f750e4a034b253b3ec5406ec
Reviewed-on: https://gerrit.libreoffice.org/68368
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 12 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index df759c529693..acaf29caba0e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4133,7 +4133,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r if ( nGroupRotateAngle ) { - double a = nGroupRotateAngle * nPi180; + double a = nGroupRotateAngle * F_PI18000; pRet->NbcRotate( aClientRect.Center(), nGroupRotateAngle, sin( a ), cos( a ) ); } if ( nSpFlags & ShapeFlag::FlipV ) @@ -4710,7 +4710,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r { if( nObjectRotation ) { - double a = nObjectRotation * nPi180; + double a = nObjectRotation * F_PI18000; pRet->NbcRotate( aObjData.aBoundRect.Center(), nObjectRotation, sin( a ), cos( a ) ); } // mirrored horizontally? @@ -4749,7 +4749,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r // pay attention to the rotations if ( nObjectRotation ) { - double a = nObjectRotation * nPi180; + double a = nObjectRotation * F_PI18000; Point aCenter( aObjData.aBoundRect.Center() ); double ss = sin(a); double cc = cos(a); @@ -4821,7 +4821,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r { if( nObjectRotation ) { - double a = nObjectRotation * nPi180; + double a = nObjectRotation * F_PI18000; pRet->NbcRotate( aObjData.aBoundRect.Center(), nObjectRotation, sin( a ), cos( a ) ); } // mirrored horizontally? @@ -5423,14 +5423,14 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, Point aPivot(rTextRect.TopLeft()); aPivot.AdjustX(nMinWH ); aPivot.AdjustY(nMinWH ); - double a = nTextRotationAngle * nPi180; + double a = nTextRotationAngle * F_PI18000; pTextObj->NbcRotate(aPivot, nTextRotationAngle, sin(a), cos(a)); } // rotate text with shape? if ( mnFix16Angle ) { - double a = mnFix16Angle * nPi180; + double a = mnFix16Angle * F_PI18000; pTextObj->NbcRotate( rObjData.aBoundRect.Center(), mnFix16Angle, sin( a ), cos( a ) ); } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 2f92c28b5822..162500f5a984 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1191,14 +1191,14 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx { if ( rObjData.nSpFlags & ShapeFlag::FlipV ) { - double a = 18000 * nPi180; + double a = 18000 * F_PI18000; pTObj->Rotate( rTextRect.Center(), 18000, sin( a ), cos( a ) ); } if ( rObjData.nSpFlags & ShapeFlag::FlipH ) nAngle = 36000 - nAngle; if ( nAngle ) { - double a = nAngle * nPi180; + double a = nAngle * F_PI18000; pTObj->NbcRotate( rObjData.aBoundRect.Center(), nAngle, sin( a ), cos( a ) ); } } |