[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/inc/interpre.hxx  |    1 
 sc/source/core/tool/interpr4.cxx |   95 ++++++++++++++++++++-------------------
 2 files changed, 51 insertions(+), 45 deletions(-)

New commits:
commit 149490915fc1c3ccce250a0a69a8c93320a3cb49
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 21 16:41:54 2010 +0200

    Fix the regression for range array input (e.g. {=A1:A5}).
    
    Typing in =A1:A5 and expanding to create a range array was broken.
    This change will fix that. (fdo#30882)

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 138d1be..0bd5ec8 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -325,6 +325,7 @@ inline void MatrixDoubleRefToMatrix();      // if MatrixFormula: PopDoubleRefPus
 // If MatrixFormula or ForceArray: ConvertMatrixParameters()
 inline bool MatrixParameterConversion();
 ScMatrixRef PopMatrix();
+void QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, ULONG& rRetIndexExpr);
 //void PushByte(BYTE nVal);
 void PushDouble(double nVal);
 void PushInt( int nVal );
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f5e0068..a1be445 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1776,6 +1776,52 @@ ScMatrixRef ScInterpreter::PopMatrix()
     return NULL;
 }
 
+void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, ULONG& rRetIndexExpr)
+{
+    if (xMat)
+    {
+        ScMatValType nMatValType;
+        const ScMatrixValue* pMatVal = xMat->Get(0, 0, nMatValType);
+        if ( pMatVal )
+        {
+            if (ScMatrix::IsNonValueType( nMatValType))
+            {
+                if ( xMat->IsEmptyPath( 0, 0))
+                {   // result of empty FALSE jump path
+                    FormulaTokenRef xRes = new FormulaDoubleToken( 0.0);
+                    PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
+                    rRetTypeExpr = NUMBERFORMAT_LOGICAL;
+                }
+                else
+                {
+                    String aStr( pMatVal->GetString());
+                    FormulaTokenRef xRes = new FormulaStringToken( aStr);
+                    PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
+                    rRetTypeExpr = NUMBERFORMAT_TEXT;
+                }
+            }
+            else
+            {
+                USHORT nErr = GetDoubleErrorValue( pMatVal->fVal);
+                FormulaTokenRef xRes;
+                if (nErr)
+                    xRes = new FormulaErrorToken( nErr);
+                else
+                    xRes = new FormulaDoubleToken( pMatVal->fVal);
+                PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
+                if ( rRetTypeExpr != NUMBERFORMAT_LOGICAL )
+                    rRetTypeExpr = NUMBERFORMAT_NUMBER;
+            }
+            rRetIndexExpr = 0;
+        }
+        else
+            SetError( errUnknownStackVariable);
+        xMat->SetErrorInterpreter( NULL);
+    }
+    else
+        SetError( errUnknownStackVariable);
+}
+
 
 void ScInterpreter::PushDouble(double nVal)
 {
@@ -4133,7 +4179,8 @@ StackVar ScInterpreter::Interpret()
                     if ( bMatrixFormula )
                     {   // create matrix for {=A1:A5}
                         PopDoubleRefPushMatrix();
-                        // no break, continue with svMatrix
+                        ScMatrixRef xMat = PopMatrix();
+                        QueryMatrixType(xMat, nRetTypeExpr, nRetIndexExpr);
                     }
                     else
                     {
@@ -4143,10 +4190,9 @@ StackVar ScInterpreter::Interpret()
                         if ( !nGlobalError && DoubleRefToPosSingleRef( aRange, aAdr))
                             PushCellResultToken( false, aAdr,
                                     &nRetTypeExpr, &nRetIndexExpr);
-                        break;
                     }
                 }
-                // no break
+                break;
                 case svExternalDoubleRef:
                 case svMatrix :
                 {
@@ -4156,48 +4202,7 @@ StackVar ScInterpreter::Interpret()
                     else
                         PopExternalDoubleRef(xMat);
 
-                    if (xMat)
-                    {
-                        ScMatValType nMatValType;
-                        const ScMatrixValue* pMatVal = xMat->Get(0, 0, nMatValType);
-                        if ( pMatVal )
-                        {
-                            if (ScMatrix::IsNonValueType( nMatValType))
-                            {
-                                if ( xMat->IsEmptyPath( 0, 0))
-                                {   // result of empty FALSE jump path
-                                    FormulaTokenRef xRes = new FormulaDoubleToken( 0.0);
-                                    PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
-                                    nRetTypeExpr = NUMBERFORMAT_LOGICAL;
-                                }
-                                else
-                                {
-                                    String aStr( pMatVal->GetString());
-                                    FormulaTokenRef xRes = new FormulaStringToken( aStr);
-                                    PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
-                                    nRetTypeExpr = NUMBERFORMAT_TEXT;
-                                }
-                            }
-                            else
-                            {
-                                USHORT nErr = GetDoubleErrorValue( pMatVal->fVal);
-                                FormulaTokenRef xRes;
-                                if (nErr)
-                                    xRes = new FormulaErrorToken( nErr);
-                                else
-                                    xRes = new FormulaDoubleToken( pMatVal->fVal);
-                                PushTempToken( new ScMatrixCellResultToken( xMat, xRes));
-                                if ( nRetTypeExpr != NUMBERFORMAT_LOGICAL )
-                                    nRetTypeExpr = NUMBERFORMAT_NUMBER;
-                            }
-                            nRetIndexExpr = 0;
-                        }
-                        else
-                            SetError( errUnknownStackVariable);
-                        xMat->SetErrorInterpreter( NULL);
-                    }
-                    else
-                        SetError( errUnknownStackVariable);
+                    QueryMatrixType(xMat, nRetTypeExpr, nRetIndexExpr);
                 }
                 break;
                 case svExternalSingleRef: