From 149a4d756699f4275f9f84807e72526e73aed1b2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 28 Mar 2018 10:01:13 +0200 Subject: loplugin:virtualdown in sc..sd Change-Id: If93dc12f484839e6d2b44d6568b506f0c15b4735 Reviewed-on: https://gerrit.libreoffice.org/51989 Tested-by: Jenkins Reviewed-by: Noel Grandin --- scaddins/source/analysis/analysishelper.cxx | 6 ------ scaddins/source/analysis/analysishelper.hxx | 9 ++++----- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'scaddins') diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index e7dd010f426a..50e1c84720eb 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2254,12 +2254,6 @@ double ConvertData::Convert( } -double ConvertData::ConvertToBase( double f, sal_Int16 n ) const -{ - return ::rtl::math::pow10Exp( f / fConst, n ); -} - - double ConvertData::ConvertFromBase( double f, sal_Int16 n ) const { return ::rtl::math::pow10Exp( f * fConst, -n ); diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index fa68eee35f0d..2aaaef3a9af0 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -546,10 +546,6 @@ public: /// @throws css::lang::IllegalArgumentException virtual double Convert( double fVal, const ConvertData& rTo, sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const; - // converts fVal from this unit to rFrom unit - // throws exception if not from same class - // this implementation is for proportional cases only - virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const; virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const; inline ConvertDataClass Class() const; @@ -572,7 +568,10 @@ public: sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const override; // for cases where f(x) = a + bx applies (e.g. Temperatures) - virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const override; + // converts fVal from this unit to rFrom unit + // throws exception if not from same class + // this implementation is for proportional cases only + virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const; virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const override; }; -- cgit