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

fpspreadsheet: Fix compilation issues introduced in last commit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3268 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-07-02 19:25:37 +00:00
parent 2f338a50a8
commit 8a41c46316
5 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/examples/fpschart/fpschart.lpi
View File

@@ -45,7 +45,6 @@
<Unit0> <Unit0>
<Filename Value="fpschart.lpr"/> <Filename Value="fpschart.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="fpschart"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="mainform.pas"/> <Filename Value="mainform.pas"/>
@@ -76,12 +75,6 @@
</Win32> </Win32>
</Options> </Options>
</Linking> </Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<Exceptions Count="3"> <Exceptions Count="3">

2
components/fpspreadsheet/examples/fpschart/mainform.pas
View File

@@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
StdCtrls, Grids, EditBtn, ExtCtrls, fpspreadsheetchart, fpspreadsheetgrid, StdCtrls, EditBtn, ExtCtrls, fpspreadsheetchart, fpspreadsheetgrid,
TAGraph, TASeries; TAGraph, TASeries;
type type

2
components/fpspreadsheet/examples/spready/mainform.pas
View File

@@ -655,7 +655,7 @@ end;
procedure TForm1.EdCellAddressEditingDone(Sender: TObject); procedure TForm1.EdCellAddressEditingDone(Sender: TObject);
var var
c, r: integer; c, r: cardinal;
begin begin
if ParseCellString(EdCellAddress.Text, r, c) then begin if ParseCellString(EdCellAddress.Text, r, c) then begin
WorksheetGrid.Row := WorksheetGrid.GetGridRow(r); WorksheetGrid.Row := WorksheetGrid.GetGridRow(r);

34
components/fpspreadsheet/fpspreadsheetchart.pas
View File

@@ -38,17 +38,17 @@ type
FXSelectionDirection: TsSelectionDirection; FXSelectionDirection: TsSelectionDirection;
FYSelectionDirection: TsSelectionDirection; FYSelectionDirection: TsSelectionDirection;
// FWorksheetGrid: TsWorksheetGrid; // FWorksheetGrid: TsWorksheetGrid;
FXFirstCellCol: Integer; FXFirstCellCol: Cardinal;
FXFirstCellRow: Integer; FXFirstCellRow: Cardinal;
FYFirstCellCol: Integer; FYFirstCellCol: Cardinal;
FYFirstCellRow: Integer; FYFirstCellRow: Cardinal;
procedure SetPointsNumber(const AValue: Integer); procedure SetPointsNumber(const AValue: Integer);
procedure SetXSelectionDirection(const AValue: TsSelectionDirection); procedure SetXSelectionDirection(const AValue: TsSelectionDirection);
procedure SetYSelectionDirection(const AValue: TsSelectionDirection); procedure SetYSelectionDirection(const AValue: TsSelectionDirection);
procedure SetXFirstCellCol(const AValue: Integer); procedure SetXFirstCellCol(const AValue: Cardinal);
procedure SetXFirstCellRow(const AValue: Integer); procedure SetXFirstCellRow(const AValue: Cardinal);
procedure SetYFirstCellCol(const AValue: Integer); procedure SetYFirstCellCol(const AValue: Cardinal);
procedure SetYFirstCellRow(const AValue: Integer); procedure SetYFirstCellRow(const AValue: Cardinal);
protected protected
FDataWorksheet: TsWorksheet; FDataWorksheet: TsWorksheet;
FCurItem: TChartDataItem; FCurItem: TChartDataItem;
@@ -63,10 +63,10 @@ type
published published
// property WorksheetGrid: TsWorksheetGrid read FWorksheetGrid write SetWorksheetGrid; // property WorksheetGrid: TsWorksheetGrid read FWorksheetGrid write SetWorksheetGrid;
property PointsNumber: Integer read FPointsNumber write SetPointsNumber default 0; property PointsNumber: Integer read FPointsNumber write SetPointsNumber default 0;
property XFirstCellCol: Integer read FXFirstCellCol write SetXFirstCellCol default 0; property XFirstCellCol: Cardinal read FXFirstCellCol write SetXFirstCellCol default 0;
property XFirstCellRow: Integer read FXFirstCellRow write SetXFirstCellRow default 0; property XFirstCellRow: Cardinal read FXFirstCellRow write SetXFirstCellRow default 0;
property YFirstCellCol: Integer read FYFirstCellCol write SetYFirstCellCol default 0; property YFirstCellCol: Cardinal read FYFirstCellCol write SetYFirstCellCol default 0;
property YFirstCellRow: Integer read FYFirstCellRow write SetYFirstCellRow default 0; property YFirstCellRow: Cardinal read FYFirstCellRow write SetYFirstCellRow default 0;
property XSelectionDirection: TsSelectionDirection read FXSelectionDirection write SetXSelectionDirection; property XSelectionDirection: TsSelectionDirection read FXSelectionDirection write SetXSelectionDirection;
property YSelectionDirection: TsSelectionDirection read FYSelectionDirection write SetYSelectionDirection; property YSelectionDirection: TsSelectionDirection read FYSelectionDirection write SetYSelectionDirection;
end; end;
@@ -108,7 +108,7 @@ begin
Notify; Notify;
end; end;
procedure TsWorksheetChartSource.SetXFirstCellCol(const AValue: Integer); procedure TsWorksheetChartSource.SetXFirstCellCol(const AValue: Cardinal);
begin begin
if FXFirstCellCol=AValue then exit; if FXFirstCellCol=AValue then exit;
FXFirstCellCol:=AValue; FXFirstCellCol:=AValue;
@@ -116,7 +116,7 @@ begin
Notify; Notify;
end; end;
procedure TsWorksheetChartSource.SetXFirstCellRow(const AValue: Integer); procedure TsWorksheetChartSource.SetXFirstCellRow(const AValue: Cardinal);
begin begin
if FXFirstCellRow=AValue then exit; if FXFirstCellRow=AValue then exit;
FXFirstCellRow:=AValue; FXFirstCellRow:=AValue;
@@ -124,7 +124,7 @@ begin
Notify; Notify;
end; end;
procedure TsWorksheetChartSource.SetYFirstCellCol(const AValue: Integer); procedure TsWorksheetChartSource.SetYFirstCellCol(const AValue: Cardinal);
begin begin
if FYFirstCellCol=AValue then exit; if FYFirstCellCol=AValue then exit;
FYFirstCellCol:=AValue; FYFirstCellCol:=AValue;
@@ -132,7 +132,7 @@ begin
Notify; Notify;
end; end;
procedure TsWorksheetChartSource.SetYFirstCellRow(const AValue: Integer); procedure TsWorksheetChartSource.SetYFirstCellRow(const AValue: Cardinal);
begin begin
if FYFirstCellRow=AValue then exit; if FYFirstCellRow=AValue then exit;
FYFirstCellRow:=AValue; FYFirstCellRow:=AValue;
@@ -208,7 +208,7 @@ end;
procedure TsWorksheetChartSource.LoadPropertiesFromStrings(AXInterval, procedure TsWorksheetChartSource.LoadPropertiesFromStrings(AXInterval,
AYInterval, AXTitle, AYTitle, ATitle: string); AYInterval, AXTitle, AYTitle, ATitle: string);
var var
lXCount, lYCount: Integer; lXCount, lYCount: Cardinal;
begin begin
Unused(AXTitle, AYTitle, ATitle); Unused(AXTitle, AYTitle, ATitle);
ParseIntervalString(AXInterval, FXFirstCellRow, FXFirstCellCol, lXCount, FXSelectionDirection); ParseIntervalString(AXInterval, FXFirstCellRow, FXFirstCellCol, lXCount, FXSelectionDirection);

5
components/fpspreadsheet/xlsbiff2.pas
View File

@@ -869,6 +869,7 @@ procedure TsSpreadBIFF2Writer.WriteCellFormatting(AStream: TStream; ACell: PCell
XFIndex: Word); XFIndex: Word);
var var
b: Byte; b: Byte;
w: Word;
begin begin
if ACell^.UsedFormattingFields = [] then if ACell^.UsedFormattingFields = [] then
begin begin
@@ -887,7 +888,9 @@ begin
// 2nd byte: // 2nd byte:
// Mask $3F: Index to FORMAT record // Mask $3F: Index to FORMAT record
// Mask $C0: Index to FONT record // Mask $C0: Index to FONT record
b := ACell.FontIndex shl 6; w := ACell.FontIndex shl 6;
b := Lo(w);
//b := ACell.FontIndex shl 6;
AStream.WriteByte(b); AStream.WriteByte(b);
// 3rd byte // 3rd byte