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

[Eike Rathke]

 sc/source/core/tool/interpr4.cxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 23e5540a05e940cb4a591815e6b85a485b01fc32
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 28 23:01:05 2016 +0200

    do not override type SC_MATVAL_BOOLEAN with SC_MATVAL_VALUE
    
    None of the callers checks for SC_MATVAL_VALUE but all use IsValueType()
    instead, which includes SC_MATVAL_BOOLEAN, but we may want to explicitly
    identify SC_MATVAL_BOOLEAN.
    
    Change-Id: I6737eb2909c819b6c54f7e62cf8ebfc12af14fea

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 992b6cb..848bebb 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2301,22 +2301,17 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix(
             SetError( errNoValue);
     }
 
-    if (nMatValType == SC_MATVAL_VALUE)
-        rDouble = nMatVal.fVal;
-    else if (nMatValType == SC_MATVAL_BOOLEAN)
-    {
-        rDouble = nMatVal.fVal;
-        nMatValType = SC_MATVAL_VALUE;
-    }
-    else
-        rString = nMatVal.GetString();
-
     if (ScMatrix::IsValueType( nMatValType))
     {
+        rDouble = nMatVal.fVal;
         sal_uInt16 nError = nMatVal.GetError();
         if (nError)
             SetError( nError);
     }
+    else
+    {
+        rString = nMatVal.GetString();
+    }
 
     return nMatValType;
 }