[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/scmatrix.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dc66835f902a4704bf9c8de765acef0e68070e7c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 29 11:14:16 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 29 15:03:19 2021 +0200

    TRet is always double
    
    Change-Id: Id1cb4cb9f0a7725a2990efb174a4e9e66bac2435
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113308
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 9013e2e14f80..bad26ddab1ee 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3335,7 +3335,7 @@ namespace {
     XXX: semantically TEmptyRes and types other than number_value_type are
     unused, but this template could serve as a basis for future enhancements.
  */
-template<typename TOp, typename TEmptyRes=double, typename TRet=double>
+template<typename TOp, typename TEmptyRes=double>
 struct MatOp
 {
 private:
@@ -3346,7 +3346,7 @@ private:
     COp<TOp, TEmptyRes> maCOp;
 
 public:
-    typedef TRet number_value_type;
+    typedef double number_value_type;
 
     MatOp( TOp aOp, ScInterpreter* pErrorInterpreter,
             double fVal = 0.0, const svl::SharedString& rString = svl::SharedString() ):
@@ -3363,12 +3363,12 @@ public:
         }
     }
 
-    TRet operator()(double fVal) const
+    double operator()(double fVal) const
     {
         return maOp(fVal, mfVal);
     }
 
-    TRet operator()(bool bVal) const
+    double operator()(bool bVal) const
     {
         return maOp(static_cast<double>(bVal), mfVal);
     }