diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-03 13:05:24 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-03 21:57:23 +0200 |
| commit | 81302f33073e7629d724ed269f1fa21dad29e141 (patch) | |
| tree | 59c1a5422fee301751c170e6ea24a3ca9b0caddc /sc | |
| parent | 83b25e4b9fa8f95c24759a64f8cb9716ee34a4a3 (diff) | |
Move angle normalization code from various places to tools
Also rename svx angle normalization functions in include/svx/svdtrans.hxx, that
deal with 100ths of degree, to avoid confusion: NormAngle180 -> NormAngle18000;
NormAngle360 -> NormAngle36000.
Some places were fixed that previously returned inclusive ranges (i.e., both 0
and 360), see changes in these files:
chart2/source/view/main/PlottingPositionHelper.cxx
chart2/source/view/main/PolarLabelPositionHelper.cxx
chart2/source/view/main/ShapeFactory.cxx
filter/source/graphicfilter/idxf/dxf2mtf.cxx
sw/source/core/graphic/grfatr.cxx
(the latter now matches the comment in the function).
Change-Id: I9f274bbb4168360d60dceff02aeba6332c519a59
Reviewed-on: https://gerrit.libreoffice.org/58556
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index c42abc33a8db..a3062d2cca18 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -81,6 +81,7 @@ #include <svx/svdpage.hxx> #include <svx/unoapi.hxx> #include <sal/log.hxx> +#include <tools/helpers.hxx> #include <document.hxx> #include <drwlayer.hxx> @@ -2430,8 +2431,7 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con if( b3dWallChart ) { // Y rotation (Excel [0..359], Chart2 [-179,180]) - nRotationY = maData.mnRotation % 360; - if( nRotationY > 180 ) nRotationY -= 360; + nRotationY = NormAngle180(maData.mnRotation); // X rotation a.k.a. elevation (Excel [-90..90], Chart2 [-179,180]) nRotationX = limit_cast< sal_Int32, sal_Int32 >( maData.mnElevation, -90, 90 ); // perspective (Excel and Chart2 [0,100]) |