svx/source/svdraw/svdoashp.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b5f9c2351b5ca73acf02906a73d7d90cd1fcdf61
Author: Armin Le Grand <a...@apache.org>
Date: Wed Sep 4 15:58:19 2013 +0000
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
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 907f3d2..a68bfb1 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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
