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

fpspreadsheet: Fix usage of format index (dxfId) in writing conditional formatting to xlsx.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7497 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-06-26 09:27:01 +00:00
parent 7f4382a137
commit 5578d181a8
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/fpspreadsheet/examples/other/conditional_formatting/demo_conditional_formatting.pas
View File

@ -15,6 +15,8 @@ begin
wb := TsWorkbook.Create; wb := TsWorkbook.Create;
try try
sh := wb.AddWorksheet('test'); sh := wb.AddWorksheet('test');
{ ------ 1st conditional format ------------------------------------------ }
sh.WriteNumber(0, 0, 1.0); sh.WriteNumber(0, 0, 1.0);
sh.WriteNumber(1, 0, 2.0); sh.WriteNumber(1, 0, 2.0);
sh.WriteNumber(2, 0, 3.0); sh.WriteNumber(2, 0, 3.0);
@ -40,13 +42,20 @@ begin
sh.WriteConditionalCellFormat(Range(0, 0, 5, 0), cfcEqual, 3.0, fmtIdx); sh.WriteConditionalCellFormat(Range(0, 0, 5, 0), cfcEqual, 3.0, fmtIdx);
{ ------- 2nd conditional format ----------------------------------------- }
sh.WriteNumber(0, 2, 10.0); sh.WriteNumber(0, 2, 10.0);
sh.WriteNumber(1, 2, 20.0); sh.WriteNumber(1, 2, 20.0);
sh.WriteNumber(2, 2, 15.0); sh.WriteNumber(2, 2, 15.0);
sh.WriteNumber(3, 2, 11.0); sh.WriteNumber(3, 2, 11.0);
sh.WriteNumber(4, 2, 19.0); sh.WriteNumber(4, 2, 19.0);
InitFormatRecord(fmt);
fmt.SetBackgroundColor(scRed);
fmtIdx := wb.AddCellFormat(fmt);
sh.WriteConditionalCellFormat(Range(0, 2, 4, 2), cfcBelowEqualAverage, fmtIdx); sh.WriteConditionalCellFormat(Range(0, 2, 4, 2), cfcBelowEqualAverage, fmtIdx);
{ ------ Save workbook to file-------------------------------------------- }
wb.WriteToFile('test.xlsx', true); wb.WriteToFile('test.xlsx', true);
finally finally
wb.Free; wb.Free;

9
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -3346,10 +3346,17 @@ const
OPERATOR_NAMES_2: array[cfcBetween..cfcNotBetween] of String = OPERATOR_NAMES_2: array[cfcBetween..cfcNotBetween] of String =
('between', 'notBetween'); ('between', 'notBetween');
var var
i: Integer;
fmtID: Integer; fmtID: Integer;
aveStr, stdDevStr, eqAveStr: String; aveStr, stdDevStr, eqAveStr: String;
begin begin
fmtID := 0; // to do: determine dxfId ! fmtID := -1;
for i := 0 to High(FDifferentialFormatIndexList) do
if FDifferentialFormatIndexList[i] = ARule.FormatIndex then
begin
fmtID := i;
break;
end;
case ARule.Condition of case ARule.Condition of
cfcEqual..cfcLessEqual: cfcEqual..cfcLessEqual: