[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - sc/source

[Tomaž Vajngerl]

 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit be1f577daaa95d83e2442531b9302a089cc3a3d5
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date:   Sun Jan 24 15:08:05 2016 +0100

    tdf#74667 interchange slope and intercept for power regression
    
    Change-Id: I9da7edeabcc9f963ac19d26114fa101d4b5ce98f
    (cherry picked from commit 4d67b0baaa4f0fb009b9ee6fbcf4618abf009f53)
    Reviewed-on: https://gerrit.libreoffice.org/21744
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index ad092ee..84939a8 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -53,21 +53,21 @@ namespace
     {
         "=SLOPE(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",
         "=SLOPE(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",
-        "=EXP(INTERCEPT(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%)))"
+        "=SLOPE(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%))"
     };
 
     OUString constTemplatesINTERCEPT[] =
     {
         "=INTERCEPT(%VARIABLE2_RANGE% ; %VARIABLE1_RANGE%)",
         "=INTERCEPT(%VARIABLE2_RANGE% ; LN(%VARIABLE1_RANGE%))",
-        "=SLOPE(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%))"
+        "=EXP(INTERCEPT(LN(%VARIABLE2_RANGE%) ; LN(%VARIABLE1_RANGE%)))"
     };
 
     OUString constRegressionFormula[] =
     {
         "=%A% * %ADDRESS% + %B%",
         "=%A% * LN(%ADDRESS%) + %B%",
-        "=%A% * %ADDRESS% ^ %B%"
+        "=%B% * %ADDRESS% ^ %A%"
     };
 
 } // end anonymous namespace