diff options
author | Muthu Subramanian <sumuthu@suse.com> | 2011-12-08 16:47:56 +0530 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2011-12-08 17:00:53 +0100 |
commit | dc20e891db2065aa14ea5eac1ea4b57a1b9da644 (patch) | |
tree | 6f9a059537ff98d3e803acad986ba198beafae2b /svx | |
parent | f7ae3384e2ad7387d839e40ca5c7196e2b597991 (diff) |
n#719989: Rotation needs to be done post flipping.
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index de53ed680217..a92a962e591e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -315,11 +315,6 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende } pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False); } - if( nRotateAngle ) - { - double a = nRotateAngle * F_PI18000; - pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) ); - } if ( bFlipV ) { Point aLeft( aRect.Left(), ( aRect.Top() + aRect.Bottom() ) >> 1 ); @@ -332,6 +327,12 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende Point aBottom( aTop.X(), aTop.Y() + 1000 ); pRenderedShape->NbcMirror( aTop, aBottom ); } + // Note that the rotation needs be done after flipping + if( nRotateAngle ) + { + double a = nRotateAngle * F_PI18000; + pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) ); + } pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), sal_True ); pRenderedShape->RecalcSnapRect(); } |