From 45f683a495411af8e059527c137af335ade79c37 Mon Sep 17 00:00:00 2001 From: Laurent Balland-Poirier Date: Sun, 27 Mar 2016 22:43:11 +0200 Subject: tdf#96871 Do not force auto log Y scale to B^0 Remove tests to fix automatic Y minimum log scale to 0. Change-Id: Ic33fbbc3d5ee86db964f74976d85e5a2e1068cca Reviewed-on: https://gerrit.libreoffice.org/23559 Tested-by: Jenkins Reviewed-by: jan iversen Tested-by: jan iversen --- chart2/source/view/axes/ScaleAutomatism.cxx | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index adbde416e882..9bc8df73e278 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -369,26 +369,16 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( than 1, and the range has been swapped above), then: */ if( bAutoMinimum && (fTempMinimum > 0.0) ) { - /* If minimum is less than 5 (i.e. original source values less than - B^5, B being the base of the scaling), or if minimum and maximum - are in different increment intervals (means, if minimum and maximum - are not both in the range [B^n,B^(n+1)] for a whole number n), set - minimum to 0, which results in B^0=1 on the axis. */ double fMinimumFloor = ::rtl::math::approxFloor( fTempMinimum ); double fMaximumFloor = ::rtl::math::approxFloor( fTempMaximum ); // handle the exact value B^(n+1) to be in the range [B^n,B^(n+1)] if( ::rtl::math::approxEqual( fTempMaximum, fMaximumFloor ) ) fMaximumFloor -= 1.0; - if( (fMinimumFloor < 5.0) || (fMinimumFloor < fMaximumFloor) ) + if( fMinimumFloor == fMaximumFloor ) { - if( m_bExpandWideValuesToZero ) - fTempMinimum = 0.0; - } - /* Else (minimum and maximum are in one increment interval), expand + /* if minimum and maximum are in one increment interval, expand minimum toward 0 to make the 'shorter' data points visible. */ - else - { if( m_bExpandNarrowValuesTowardZero ) fTempMinimum -= 1.0; } -- cgit v1.2.3