pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Add option to construct rpn token array in reverse order for correct reading of rpn formulas in xls files (current reading code is not correct)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3297 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-07-08 15:28:11 +00:00
parent 7e22f0e6ad
commit 428bf6bd93
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -979,7 +979,7 @@ type
Next: PRPNItem;
end;
function CreateRPNFormula(AItem: PRPNItem): TsRPNFormula;
function CreateRPNFormula(AItem: PRPNItem; AReverse: Boolean = false): TsRPNFormula;
procedure DestroyRPNFormula(AItem: PRPNItem);
function RPNBool(AValue: Boolean;
@ -5861,6 +5861,9 @@ end;
@param AItem Pointer to the first RPN item representing the formula.
Each item contains a pointer to the next item in the list.
The list is terminated by nil.
@param AReverse If true the first rpn item in the chained list becomes the
last item in the token array. This feature is needed for
reading an xls file.
@example
The RPN formula for the string expression "$A1+2" can be created as follows:
@ -5875,7 +5878,7 @@ end;
nil))));
</pre>
}
function CreateRPNFormula(AItem: PRPNItem): TsRPNFormula;
function CreateRPNFormula(AItem: PRPNItem; AReverse: Boolean = false): TsRPNFormula;
var
item: PRPNItem;
nextitem: PRPNItem;
@ -5894,11 +5897,11 @@ begin
// Copy FormulaElements to result and free temporary RPNItems
item := AItem;
n := 0;
if AReverse then n := Length(Result)-1 else n := 0;
while item <> nil do begin
nextitem := item^.Next;
Result[n] := item^.FE;
inc(n);
if AReverse then dec(n) else inc(n);
DisposeRPNItem(item);
item := nextitem;
end;