diff options
| author | Armin Le Grand <alg@apache.org> | 2013-09-04 15:58:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-05 13:25:18 +0100 |
| commit | b5f9c2351b5ca73acf02906a73d7d90cd1fcdf61 (patch) | |
| tree | 53795099c0c2d42619e43828309b4fd25402a639 /svx | |
| parent | CID#1078757 nOfs <= nPersistPtrAnz (diff) | |
| download | core-b5f9c2351b5ca73acf02906a73d7d90cd1fcdf61.tar.gz core-b5f9c2351b5ca73acf02906a73d7d90cd1fcdf61.zip | |
Resolves: #i123181# Corrected mirroring of shear angle...
in SdrObjCustomShape::TRSetBaseGeometry, this was wrong
(cherry picked from commit 7462607928247310b6426325e374c2f9e6f33bd9)
Conflicts:
svx/source/svdraw/svdoashp.cxx
Change-Id: I40c0b16075f5849b4514a7a282afa283793282ea
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 907f3d23a038..a68bfb124baa 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3029,8 +3029,10 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, if(!basegfx::fTools::equalZero(fShearX)) { GeoStat aGeoStat; - // #i121932# do *not* forget to invert shearX(!) - aGeoStat.nShearWink = FRound((atan(-fShearX) / F_PI180) * 100.0); + // #i123181# The fix for #121932# here was wrong, the trunk version does not correct the + // mirrored shear values, neither at the object level, nor on the API or XML level. Taking + // back the mirroring of the shear angle + aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0); aGeoStat.RecalcTan(); Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False); } |