diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-16 23:05:48 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-17 10:07:48 +0400 |
| commit | 005d6524977bd51ce2f859b5ae5352a2fba68dd0 (patch) | |
| tree | bfa5e9ac4b26a4d8f1fcb845de3758156568dc65 | |
| parent | d8088c2262884e6a39f67879cbb808d588fde1fd (diff) | |
fdo#43193: fix rotation of shapes in imported MS documents
This partially reverts commit 1fbbd6134573beedc72a3839d65b27dfc829f2fb.
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 7c4284f7f4fa..9c6a719e4e27 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4443,22 +4443,27 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r rSt >> aRecHd; if ( aRecHd.nRecType == DFF_msofbtSpContainer ) { + sal_Int32 nGroupRotateAngle = 0; + sal_Int32 nSpFlags = 0; mnFix16Angle = 0; if (!aRecHd.SeekToBegOfRecord(rSt)) return pRet; - pRet = ImportObj( rSt, pClientData, rClientRect, rGlobalChildRect, nCalledByGroup + 1, pShapeId ); if ( pRet ) { + nSpFlags = nGroupShapeFlags; + nGroupRotateAngle = mnFix16Angle; + Rectangle aClientRect( rClientRect ); + Rectangle aGlobalChildRect; if ( !nCalledByGroup || rGlobalChildRect.IsEmpty() ) aGlobalChildRect = GetGlobalChildAnchor( rHd, rSt, aClientRect ); else aGlobalChildRect = rGlobalChildRect; - if ( ( mnFix16Angle > 4500 && mnFix16Angle <= 13500 ) - || ( mnFix16Angle > 22500 && mnFix16Angle <= 31500 ) ) + if ( ( nGroupRotateAngle > 4500 && nGroupRotateAngle <= 13500 ) + || ( nGroupRotateAngle > 22500 && nGroupRotateAngle <= 31500 ) ) { sal_Int32 nHalfWidth = ( aClientRect.GetWidth() + 1 ) >> 1; sal_Int32 nHalfHeight = ( aClientRect.GetHeight() + 1 ) >> 1; @@ -4509,18 +4514,18 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r return pRet; } - if ( mnFix16Angle ) + if ( nGroupRotateAngle ) { - double a = mnFix16Angle * nPi180; - pRet->NbcRotate( aClientRect.Center(), mnFix16Angle, sin( a ), cos( a ) ); + double a = nGroupRotateAngle * nPi180; + pRet->NbcRotate( aClientRect.Center(), nGroupRotateAngle, sin( a ), cos( a ) ); } - if ( nGroupShapeFlags & SP_FFLIPV ) // Vertical flip? + if ( nSpFlags & SP_FFLIPV ) // Vertical flip? { // BoundRect in aBoundRect Point aLeft( aClientRect.Left(), ( aClientRect.Top() + aClientRect.Bottom() ) >> 1 ); Point aRight( aLeft.X() + 1000, aLeft.Y() ); pRet->NbcMirror( aLeft, aRight ); } - if ( nGroupShapeFlags & SP_FFLIPH ) // Horizontal flip? + if ( nSpFlags & SP_FFLIPH ) // Horizontal flip? { // BoundRect in aBoundRect Point aTop( ( aClientRect.Left() + aClientRect.Right() ) >> 1, aClientRect.Top() ); Point aBottom( aTop.X(), aTop.Y() + 1000 ); |