diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2018-01-29 23:47:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-30 09:28:27 +0100 |
| commit | 85a7a319bfffb1f709ed504cfadea3bbef077ec1 (patch) | |
| tree | bf64a7551bd0fd2905538144f1449cf5c265b539 /oox | |
| parent | 7655001a65a250ea7cd70f2efcc78037b5a9813f (diff) | |
Revert "tdf#114821 calculate correct label position"
This reverts commit 1ede9f7ff6f2250fa2c75bc4dc099246a59dcec0, because it
caused division-by-zero errors, see comment at
<https://gerrit.libreoffice.org/#/c/48242/6> "tdf#114821 calculate
correct label position".
Change-Id: Ifca811bda04721898387b4799de2d2da31290fa0
Reviewed-on: https://gerrit.libreoffice.org/48860
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 7c53c712bd88..08f716e514f0 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -260,8 +260,8 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat csscd::BOTTOM_LEFT, csscd::BOTTOM, csscd::BOTTOM_RIGHT }; const double nMax=std::max( - fabs(mrModel.mxLayout->mfW), - fabs(mrModel.mxLayout->mfH)); + fabs(mrModel.mxLayout->mfX), + fabs(mrModel.mxLayout->mfY)); const int simplifiedX=lclSgn(mrModel.mxLayout->mfX/nMax); const int simplifiedY=lclSgn(mrModel.mxLayout->mfY/nMax); aPropSet.setProperty( PROP_LabelPlacement, |