From 1ede9f7ff6f2250fa2c75bc4dc099246a59dcec0 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Wed, 3 Jan 2018 13:24:32 +0100 Subject: tdf#114821 calculate correct label position MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Max is now equal to whole surface size, not only point pos. Change-Id: If231fb7224b23e9993fcf575f5a020ca8e2b04ab Reviewed-on: https://gerrit.libreoffice.org/48242 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- oox/source/drawingml/chart/seriesconverter.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index e257bdbf9141..be17ee8c8079 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -237,8 +237,8 @@ void DataLabelConverter::convertFromModel( const Reference< XDataSeries >& rxDat csscd::BOTTOM_LEFT, csscd::BOTTOM, csscd::BOTTOM_RIGHT }; const double nMax=std::max( - fabs(mrModel.mxLayout->mfX), - fabs(mrModel.mxLayout->mfY)); + fabs(mrModel.mxLayout->mfW), + fabs(mrModel.mxLayout->mfH)); const int simplifiedX=lclSgn(mrModel.mxLayout->mfX/nMax); const int simplifiedY=lclSgn(mrModel.mxLayout->mfY/nMax); aPropSet.setProperty( PROP_LabelPlacement, -- cgit