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

fpspreadsheet: Set package versions 1.3 in order to follow the convention of giving the trunk version an odd number. Silence some compiler hints.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3826 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-12-06 18:09:15 +00:00
parent ec9ab37f74
commit fdd9b88f43
7 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/fpsopendocument.pas
View File

@ -1037,6 +1037,7 @@ var
lCell: TCell; lCell: TCell;
begin begin
// a temporary cell record to store the formatting if there is any // a temporary cell record to store the formatting if there is any
lCell.Row := ARow; // to silence a compiler warning...
InitCell(ARow, ACol, lCell); InitCell(ARow, ACol, lCell);
lCell.ContentType := cctEmpty; lCell.ContentType := cctEmpty;
@ -3813,6 +3814,7 @@ begin
// Empty cell? Need to count how many "table:number-columns-repeated" to be added // Empty cell? Need to count how many "table:number-columns-repeated" to be added
colsRepeated := 1; colsRepeated := 1;
lCell.Row := r; // to silence a compiler hint...
InitCell(r, c, lCell); InitCell(r, c, lCell);
value := varNull; value := varNull;
styleCell := nil; styleCell := nil;

1
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -2018,7 +2018,6 @@ end;
procedure TsWorksheet.CopyFormula(AFromCell, AToCell: PCell); procedure TsWorksheet.CopyFormula(AFromCell, AToCell: PCell);
var var
rpnFormula: TsRPNFormula; rpnFormula: TsRPNFormula;
isSharedFormula: Boolean;
lCell: TCell; lCell: TCell;
begin begin
if (AFromCell = nil) or (AToCell = nil) then if (AFromCell = nil) or (AToCell = nil) then

2
components/fpspreadsheet/laz_fpspreadsheet.lpk
View File

@ -25,7 +25,7 @@
This package is all you need if you don't want graphical components (like grids and charts)."/> 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)."/> <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="2"/> <Version Major="1" Minor="3"/>
<Files Count="27"> <Files Count="27">
<Item1> <Item1>
<Filename Value="fpolestorage.pas"/> <Filename Value="fpolestorage.pas"/>

2
components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
View File

@ -19,7 +19,7 @@
It provides graphical components like a grid and chart."/> 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)."/> <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="2"/> <Version Major="1" Minor="3"/>
<Files Count="5"> <Files Count="5">
<Item1> <Item1>
<Filename Value="fpspreadsheetctrls.pas"/> <Filename Value="fpspreadsheetctrls.pas"/>

2
components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
View File

@ -23,7 +23,7 @@
It provides a graphical export component on the Data Export tab."/> 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)."/> <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="2"/> <Version Major="1" Minor="3"/>
<Files Count="2"> <Files Count="2">
<Item1> <Item1>
<Filename Value="fpsexport.pas"/> <Filename Value="fpsexport.pas"/>

1
components/fpspreadsheet/xlscommon.pas
View File

@ -2938,6 +2938,7 @@ begin
for r := 0 to Workbook.VirtualRowCount-1 do for r := 0 to Workbook.VirtualRowCount-1 do
for c := 0 to Workbook.VirtualColCount-1 do for c := 0 to Workbook.VirtualColCount-1 do
begin begin
lCell.Row := r; // to silence a compiler hint...
InitCell(lCell); InitCell(lCell);
value := varNull; value := varNull;
styleCell := nil; styleCell := nil;

1
components/fpspreadsheet/xlsxooxml.pas
View File

@ -1937,6 +1937,7 @@ begin
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<row r="%d" spans="1:%d"%s>', [r+1, Workbook.VirtualColCount, rh])); '<row r="%d" spans="1:%d"%s>', [r+1, Workbook.VirtualColCount, rh]));
for c := 0 to c2 do begin for c := 0 to c2 do begin
lCell.Row := r; // to silence a compiler hint
InitCell(lCell); InitCell(lCell);
value := varNull; value := varNull;
styleCell := nil; styleCell := nil;