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

fpspreadsheet: Fix ods repeated rows/cols unit tests.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4506 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-02-16 10:28:14 +00:00
parent fdf0f89a66
commit e3d715a8a8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpspreadsheet/fpsopendocument.pas
View File

@ -4603,7 +4603,7 @@ begin
inc(k); inc(k);
end end
else else
while (k <= lastCol) do while (k <= lastCol) and (k < firstRepeatedPrintCol) do
begin begin
if ASheet.GetColWidth(k) = w then if ASheet.GetColWidth(k) = w then
inc(colsRepeated) inc(colsRepeated)
@ -4617,7 +4617,7 @@ begin
'<table:table-column table:style-name="%s"%s table:default-cell-style-name="Default" />', '<table:table-column table:style-name="%s"%s table:default-cell-style-name="Default" />',
[styleName, colsRepeatedStr])); [styleName, colsRepeatedStr]));
if headerCols and (k-1 = lastRepeatedPrintCol) then if headerCols and (k >= lastRepeatedPrintCol) then
begin begin
AppendToStream(AStream, '</table:table-header-columns>'); AppendToStream(AStream, '</table:table-header-columns>');
headerCols := false; headerCols := false;
@ -5007,7 +5007,7 @@ begin
r := rr; r := rr;
// Header rows need a special tag // Header rows need a special tag
if headerRows and (r-1 = lastRepeatedPrintRow) then if headerRows and (r >= lastRepeatedPrintRow) then
begin begin
AppendToStream(AStream, '</table:table-header-rows>'); AppendToStream(AStream, '</table:table-header-rows>');
headerRows := false; headerRows := false;

4
components/fpspreadsheet/tests/pagelayouttests.pas
View File

@ -766,6 +766,7 @@ var
MyWorksheet: TsWorksheet; MyWorksheet: TsWorksheet;
rng: TsCellRange; rng: TsCellRange;
sheetname: String; sheetname: String;
r, c: Cardinal;
begin begin
TempFile := GetTempFileName; TempFile := GetTempFileName;
@ -773,6 +774,9 @@ begin
try try
sheetname := PageLayoutSheet; sheetname := PageLayoutSheet;
MyWorksheet := MyWorkbook.AddWorksheet(sheetname); MyWorksheet := MyWorkbook.AddWorksheet(sheetname);
for r := 0 to 10 do
for c := 0 to 10 do
MyWorksheet.WriteNumber(r, c, r*100+c);
MyWorksheet.SetRepeatedPrintRows(AFirstRow, ALastRow); MyWorksheet.SetRepeatedPrintRows(AFirstRow, ALastRow);
MyWorksheet.SetRepeatedPrintCols(AFirstCol, ALastCol); MyWorksheet.SetRepeatedPrintCols(AFirstCol, ALastCol);
MyWorkBook.WriteToFile(TempFile, AFormat, true); MyWorkBook.WriteToFile(TempFile, AFormat, true);