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

[Libreoffice Gerrit user]

 sc/source/core/opencl/formulagroupcl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 75181d83c1eb2d9683eaa2ea6290826435c99001
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Jul 5 12:09:34 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Jul 14 22:22:18 2018 +0200

    disable OpenCL for XIRR
    
    The function actually fails with sc/qa/.../xirr.fods if OpenCL is forced
    (and mnOpenCLMinimumFormulaGroupSize is disabled). As far as I can tell
    the OpenCL function gets the proper data and returns incorect data,
    so it's the function itself that is buggy. No idea how to debug it,
    feel free to.
    
    Change-Id: I8879c6fdcfe8ecd2bc40fd3e0d1c13cddb1c2051
    Reviewed-on: https://gerrit.libreoffice.org/57002
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 406ebf8e36ab1d1e10fb1d55101d7fc66add0c4b)
    Reviewed-on: https://gerrit.libreoffice.org/57227
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 84ee1cc30798..2106e2288aad 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3136,11 +3136,11 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpMDuration, nResultSize));
                 }
-                else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getXirr")
+                /*else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getXirr")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i],
                             new OpXirr, nResultSize));
-                }
+                }*/
                 else if (pChild->GetExternal() == "com.sun.star.sheet.addin.Analysis.getOddlprice")
                 {
                     mvSubArguments.push_back(SoPHelper(mCalcConfig, ts,