Use ScFunctionData and thus Welford in Consolidation

Change-Id: I83972b07dafadf87f7322897332bbdf0cf58afd3
Reviewed-on: https://gerrit.libreoffice.org/65162
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

1 files changed, 12 insertions, 10 deletions

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 2e2811e54815..377531330c29 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -62,21 +62,23 @@ private:
 class ScFunctionData
 {
 public:
+    ScFunctionData() : meFunc(SUBTOTAL_FUNC_NONE), mbError(false) {}
     ScFunctionData( ScSubTotalFunc eFn ) : meFunc(eFn), mbError(false) {}
-    void             update( double fNewVal );
+
+    void            update( double fNewVal );
     /// Check getError() after (!) obtaining the result.
-    double           getResult();
-    bool             getError() const    { return mbError; }
-    ScSubTotalFunc   getFunc() const     { return meFunc; }
-    void             setError()          { mbError = true; }
+    double          getResult();
+    bool            getError() const    { return mbError; }
+    ScSubTotalFunc  getFunc() const     { return meFunc; }
+    void            setError()          { mbError = true; }
 
 private:
-    WelfordRunner           maWelford;
-    ScSubTotalFunc const    meFunc;
-    bool                    mbError;
+    WelfordRunner   maWelford;
+    ScSubTotalFunc  meFunc;
+    bool            mbError;
 
-    double&          getValueRef()  { return maWelford.mfMean; }
-    sal_uInt64&      getCountRef()  { return maWelford.mnCount; }
+    double&         getValueRef()   { return maWelford.mfMean; }
+    sal_uInt64&     getCountRef()   { return maWelford.mnCount; }
 };
 
 #endif