fpspreadsheet: Change package version to 1.7. Clean up compilation warnings.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4198 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-06-28 17:59:09 +00:00
parent 4c43ae6e25
commit d8e49350eb
8 changed files with 10 additions and 12 deletions

View File

@@ -239,7 +239,7 @@ Summary=Free Pascal Spreadsheet Library
Title=FPSpreadsheet
VersionBuild=0
VersionMajor=1
VersionMinor=6
VersionMinor=7
VersionRelease=0
[Macro Header Files]

View File

@@ -398,6 +398,7 @@ type
TsMissingArgExprNode = class(TsExprNode)
protected
procedure GetNodeValue(out AResult: TsExpressionResult); override;
public
function AsString: String; override;
function AsRPNItem(ANext: PRPNItem): PRPNItem; override;
function NodeType: TsResultType; override;
@@ -869,15 +870,17 @@ resourcestring
SErrInvalidCell = 'No valid cell address specification : %s';
SErrInvalidCellRange = 'No valid cell range specification : %s';
SErrNoOperand = 'No operand for unary operation %s';
{ -- currently not used:
SErrNoLeftOperand = 'No left operand for binary operation %s';
SErrNoRightOperand = 'No left operand for binary operation %s';
SErrNoNegation = 'Cannot negate expression of type %s: %s';
SErrNoUPlus = 'Cannot perform unary plus operation on type %s: %s';
SErrNoNOTOperation = 'Cannot perform NOT operation on expression of type %s: %s';
SErrNoPercentOperation = 'Cannot perform percent operation on expression of type %s: %s';
SErrTypesDoNotMatch = 'Type mismatch: %s<>%s for expressions "%s" and "%s".';
SErrNoNodeToCheck = 'Internal error: No node to check !';
SInvalidNodeType = 'Node type (%s) not in allowed types (%s) for expression: %s';
}
SErrNoNOTOperation = 'Cannot perform NOT operation on expression of type %s: %s';
SErrNoPercentOperation = 'Cannot perform percent operation on expression of type %s: %s';
SErrUnterminatedExpression = 'Badly terminated expression. Found token at position %d : %s';
SErrDuplicateIdentifier = 'An identifier with name "%s" already exists.';
SErrInvalidResultCharacter = '"%s" is not a valid return type indicator';
@@ -1531,7 +1534,6 @@ end;
function TsExpressionParser.Level5: TsExprNode;
var
tt: TsTokenType;
right: TsExprNode;
begin
{$ifdef debugexpr} Writeln('Level 5 ',TokenName(TokenType),': ',CurrentToken);{$endif debugexpr}
@@ -1539,7 +1541,6 @@ begin
try
while (TokenType = ttPower) do
begin
tt := TokenType;
GetToken;
right := Level6;
Result := TsPowerExprNode.Create(self, Result, right);
@@ -1583,7 +1584,6 @@ end;
function TsExpressionParser.Level7: TsExprNode;
var
Right: TsExprNode;
currToken: String;
begin
{$ifdef debugexpr} Writeln('Level 7 ',TokenName(TokenType),': ',CurrentToken);{$endif debugexpr}

View File

@@ -1412,8 +1412,6 @@ procedure fpsERRORTYPE(var Result: TsExpressionResult; const Args: TsExprParamet
// returns the numeric representation of one of the errors in Excel.
// "value" can be one of the following Excel error values
// #NULL! #DIV/0! #VALUE! #REF! #NAME? #NUM! #N/A #GETTING_DATA
var
cell: PCell;
begin
if (Args[0].ResultType = rtError) and (ord(Args[0].ResError) <= ord(errArgError))
then

View File

@@ -18,7 +18,7 @@ unit fpsutils;
interface
uses
Classes, SysUtils, StrUtils,
Classes, SysUtils, //StrUtils,
fpstypes;
// Exported types

View File

@@ -27,7 +27,7 @@
This package is all you need if you don't want graphical components (like grids and charts)."/>
<License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
<Version Major="1" Minor="6"/>
<Version Major="1" Minor="7"/>
<Files Count="35">
<Item1>
<Filename Value="fpolestorage.pas"/>

View File

@@ -19,7 +19,7 @@
It provides graphical components like a grid and chart."/>
<License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
<Version Major="1" Minor="6"/>
<Version Major="1" Minor="7"/>
<Files Count="5">
<Item1>
<Filename Value="fpspreadsheetctrls.pas"/>

View File

@@ -24,7 +24,7 @@
It provides a graphical export component on the Data Export tab."/>
<License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
<Version Major="1" Minor="6"/>
<Version Major="1" Minor="7"/>
<Files Count="2">
<Item1>
<Filename Value="fpsexport.pas"/>