Revert FZERO function changes.

The scope isn't handled correctly and values for variables disappear between calls. LibreOffice users must perform calculations on univariate functions.

Author: ws-garcia

src/LO Basic/VBAExpressionsLib/TestRunner.xba

@@ -576,6 +576,54 @@ Private Sub VALIDATEcircleTangents(testName As String)
     	SF_Exception.debugprint("+ Success test " & testName)
     End If
 
+TestExit:
+    Exit Sub
+TestFail:
+    SF_Exception.debugprint("Test " & testName & " raised an error: #" & err.Number & " - " & err.Description)
+    Resume TestExit			
+End Sub
+
+Private Sub LargestSquareInRATriangle(testName As String)
+    On Error GoTo TestFail
+    Dim expect As String
+    Dim contFunct As String
+    
+    tTotal=tTotal+1
+    Set Evaluator = New VBAexpressions
+    contFunct = "FZERO('GET(_side_;DISTANCE(LINESINTERSECT(" _
+                                    & "PERPENDICULAR(hyp;{{x;0}});hyp)" _
+                                & ";{{x;0}}))" _
+                        & "-" _
+                & "DISTANCE(LINESINTERSECT(" _
+                                & "PERPENDICULAR(PERPENDICULAR(" _
+                                                & "hyp;{{x;0}})" _
+                                            & ";{{x;0}})" _
+                                & ";leg.a)" _
+                        & ";{{x;0}})'" _
+                    & ";0;12)"
+    With Evaluator
+		'Triangle hypotenuse
+        .Create "GET('hyp';{{12;0};{0;5}})": .Eval
+        'Leg a definition
+        .Create "GET(_leg.a_;{{0;0};{0;5}})", False: .Eval
+        .Create contFunct, False: .Eval
+        actual = .result
+        If .ErrorType = 0 Then
+            .Create "ROUND(side^2;4)", False: .Eval
+            If .ErrorType = 0 Then
+                actual .result
+            End If
+        End If
+    End With
+    expect = "11.6016"
+    
+    If expect <> actual Then 
+    	SF_Exception.debugprint("x Failed test " & testName, expect,"<>",actual)
+    Else
+    	sAcum=sAcum+1
+    	SF_Exception.debugprint("+ Success test " & testName)
+    End If
+
 TestExit:
     Exit Sub
 TestFail:

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -3760,8 +3760,6 @@ End Function
 ''' <summary>
 '''     Finds a zero of a univariate function ussing a modified bisection method.
 '''     aFunction must be a continuous function f(x) for the interval a <= x <= b.
-'''     The function zeroing will be performed on the unassigned variable. If more
-'''     than one variables are unassigned, an error will be returned.
 ''' </summary>
 ''' <param name="aFunction">Inline function.</param>
 ''' <param name="a">Leftmost interval value.</param>
@@ -3795,16 +3793,13 @@ Private Function fZeroMBM(ByRef aFunction As String, ByVal A As Double, _
     aZero = 10 * epsilon
     With fEvalHelper
         .Create aFunction
-        Set .EvalScope = .EvalScope.CopyScope(P_SCOPE)
         tmpVar() = Split(.CurrentVariables, "; ")
         varLB = LBound(tmpVar)
-        If UBound(tmpVar) - varLB > 0 Then  'Check multivariate functions
+        If UBound(tmpVar) - varLB > 0 Then  'Reject multivariate functions
             For i = varLB To UBound(tmpVar)
                 If Not IsConstant(tmpVar(i)) Then
-                    If Not IsAssigned(tmpVar(i)) Then
-                    	varCounter = varCounter + 1
-                    	varIdx = i
-                    End If
+                    varCounter = varCounter + 1
+                    varIdx = i
                 End If
             Next i
             If varCounter > 1 Then
@@ -3865,16 +3860,13 @@ Private Function fZeroMBM(ByRef aFunction As String, ByVal A As Double, _
         .LetVarValue(tmpVar(varIdx), tmpResult)
         If Round(tmpFzeroEval, Len(CStr(1 / aZero)) - 1) = 0 Then
             If includeVarNames Then
-                fZeroMBM = ToLiteralString( _
-                                tmpVar(varIdx) & d_Space & op_equal _
-                                & d_Space & tmpResult)
+                fZeroMBM = ToLiteralString(.CurrentVarValues)
             Else
                 fZeroMBM = tmpResult
             End If
         Else
             fZeroMBM = e_ValueError
         End If
-        Set P_SCOPE = .EvalScope.CopyToScope
     End With
 fZeroMBM_terminate:
     Set fEvalHelper = Nothing

src/LO Basic/VBAExpressionsLib/script.xlb

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
 <library:library xmlns:library="http://openoffice.org/2000/library" library:name="VBAExpressionsLib" library:readonly="false" library:passwordprotected="false">
- <library:element library:name="VBAexpressionsScope"/>
- <library:element library:name="UDFunctions"/>
  <library:element library:name="VBAcallBack"/>
- <library:element library:name="VBAstrHelper"/>
+ <library:element library:name="UDFunctions"/>
+ <library:element library:name="VBAexpressionsScope"/>
  <library:element library:name="VBAexpressions"/>
+ <library:element library:name="VBAstrHelper"/>
  <library:element library:name="TestRunner"/>
 </library:library>