diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-06 08:32:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-18 20:05:01 +0100 |
| commit | eb8971e5fe52bcb80eff56846182ac30c261e111 (patch) | |
| tree | 170f5efa7d5cc1525fa108f9cfdb61ef6c327346 /filter | |
| parent | 7d2c9ac5c12232c15d21ee83387c31847553de80 (diff) | |
Resolves: #i120437# Connector corrections in groups and PPT imports
(cherry picked from commit b26e298d31cad25c326041287acb6544efac21c6)
Conflicts:
svx/source/svdraw/svdoedge.cxx
Change-Id: Id4bed1c85bccdae878872557fd3e625d772228ff
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 549643b07d14..922dec334bba 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4508,6 +4508,9 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r RotatePoint(aPoint1, aCenter, ss, cc); RotatePoint(aPoint2, aCenter, ss, cc); + + // #i120437# reset rotation, it is part of the path and shall not be applied again + nObjectRotation = 0; } // rotate/mirror line within the area as we need it @@ -4516,14 +4519,19 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r sal_Int32 n = aPoint1.X(); aPoint1.X() = aPoint2.X(); aPoint2.X() = n; + + // #i120437# reset hor filp + nSpFlags &= ~SP_FFLIPH; } if ( nSpFlags & SP_FFLIPV ) { sal_Int32 n = aPoint1.Y(); aPoint1.Y() = aPoint2.Y(); aPoint2.Y() = n; + + // #i120437# reset ver filp + nSpFlags &= ~SP_FFLIPV; } - nSpFlags &= ~( SP_FFLIPV | SP_FFLIPH ); pRet->NbcSetPoint(aPoint1, 0L); // start point pRet->NbcSetPoint(aPoint2, 1L); // endpoint |