diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 16:31:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 16:31:52 +0000 |
| commit | a1ad81da3098f9b78a2f6d0dcc77b971b7d6693e (patch) | |
| tree | bb2d65bf04cf090464fd7931ad24513e9879be76 /chart2/source/view/axes/VCartesianAxis.cxx | |
| parent | a18f8631a5616a04dd2587871715c4bc2ab59e35 (diff) | |
INTEGRATION: CWS aw052 (1.7.24); FILE MERGED
2007/06/27 11:40:22 aw 1.7.24.2: #i78696# unified creation of fRotationAnglePi
2007/06/26 16:39:26 aw 1.7.24.1: #i78696# changed handling of rotation contained in transformation to mathematically correct orientation
Diffstat (limited to 'chart2/source/view/axes/VCartesianAxis.cxx')
| -rw-r--r-- | chart2/source/view/axes/VCartesianAxis.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 4c7f15051b0b..720aa9755ae4 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -4,9 +4,9 @@ * * $RCSfile: VCartesianAxis.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2007-07-25 09:03:24 $ + * last change: $Author: hr $ $Date: 2007-08-02 17:31:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -310,7 +310,8 @@ Reference< drawing::XShape > createSingleLabel( if(!rLabel.getLength()) return 0; - double fRotationAnglePi = rAxisLabelProperties.fRotationAngleDegree*F_PI/180.0; + // #i78696# use mathematically correct rotation now + const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi ); rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters ); @@ -1095,8 +1096,9 @@ void SAL_CALL VCartesianAxis::updatePositions() static_cast<sal_Int32>(aTickScreenPos2D.getX()) ,static_cast<sal_Int32>(aTickScreenPos2D.getY())); - uno::Any aATransformation = ShapeFactory::makeTransformation( - aAnchorScreenPosition2D, m_aAxisLabelProperties.fRotationAngleDegree*F_PI/180.0 ); + // #i78696# use mathematically correct rotation now + const double fRotationAnglePi(m_aAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0)); + uno::Any aATransformation = ShapeFactory::makeTransformation(aAnchorScreenPosition2D, fRotationAnglePi); //set new position uno::Reference< beans::XPropertySet > xProp( xShape2DText, uno::UNO_QUERY ); |