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

fpspreadsheet: Fix range check error in ods writer (see http://forum.lazarus.freepascal.org/index.php/topic,36059.msg240963.html#msg240963)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5805 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-03-14 16:55:00 +00:00
parent ed6d78b980
commit 29f8b2a131
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@@ -5281,8 +5281,8 @@ var
begin begin
// widthMultiplier := Workbook.GetFont(0).Size / 2; // widthMultiplier := Workbook.GetFont(0).Size / 2;
lastCol := ASheet.GetLastColIndex; lastCol := ASheet.GetLastColIndex;
firstRepeatedPrintCol := ASheet.PageLayout.RepeatedCols.FirstIndex; firstRepeatedPrintCol := longInt(ASheet.PageLayout.RepeatedCols.FirstIndex);
lastRepeatedPrintCol := ASheet.PageLayout.RepeatedCols.LastIndex; lastRepeatedPrintCol := longint(ASheet.PageLayout.RepeatedCols.LastIndex);
if (firstRepeatedPrintCol <> Longint(UNASSIGNED_ROW_COL_INDEX)) and if (firstRepeatedPrintCol <> Longint(UNASSIGNED_ROW_COL_INDEX)) and
(lastRepeatedPrintCol = LongInt(UNASSIGNED_ROW_COL_INDEX)) (lastRepeatedPrintCol = LongInt(UNASSIGNED_ROW_COL_INDEX))
then then
@@ -5666,8 +5666,8 @@ begin
GetSheetDimensions(ASheet, firstRow, lastRow, firstCol, lastCol); GetSheetDimensions(ASheet, firstRow, lastRow, firstCol, lastCol);
headerRows := false; headerRows := false;
firstRepeatedPrintRow := ASheet.PageLayout.RepeatedRows.FirstIndex; firstRepeatedPrintRow := Integer(ASheet.PageLayout.RepeatedRows.FirstIndex);
lastRepeatedPrintRow := ASheet.PageLayout.RepeatedRows.LastIndex; lastRepeatedPrintRow := Integer(ASheet.PageLayout.RepeatedRows.LastIndex);
if (firstRepeatedPrintRow <> Integer(UNASSIGNED_ROW_COL_INDEX)) and if (firstRepeatedPrintRow <> Integer(UNASSIGNED_ROW_COL_INDEX)) and
(lastRepeatedPrintRow = Integer(UNASSIGNED_ROW_COL_INDEX)) (lastRepeatedPrintRow = Integer(UNASSIGNED_ROW_COL_INDEX))
then then