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

fpspreadsheet: Unified usage of color syntax in Excel xlsx files

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8036 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2021-05-18 10:38:33 +00:00
parent 639385a707
commit 7959f69879
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,6 +485,13 @@ const
'5Quarters' // REPLACEMENT FOR is5Boxes which needs x14 '5Quarters' // REPLACEMENT FOR is5Boxes which needs x14
); );
function ColorToExcelStr(AColor: TsColor): String;
begin
Result := ColorToHTMLColorStr(AColor, true); // --> "00rrggbb"
Result[1] := 'F';
Result[2] := 'F'; // --> "FFrrggbb"
end;
function StrToFillStyle(s: String): TsFillStyle; function StrToFillStyle(s: String): TsFillStyle;
var var
fs: TsFillStyle; fs: TsFillStyle;
@ -596,7 +603,7 @@ end;
function CF_ColorNode(AColor: TsColor): String; function CF_ColorNode(AColor: TsColor): String;
begin begin
Result := Format('<color rgb="%s" />', [ColorToHTMLColorStr(AColor, true)]); Result := Format('<color rgb="%s" />', [ColorToExcelStr(AColor)]);
end; end;
@ -4117,7 +4124,7 @@ procedure TsSpreadOOXMLWriter.WriteBorderList(AStream: TStream);
// Border color // Border color
rgb := AFormatRecord^.BorderStyles[ABorder].Color; rgb := AFormatRecord^.BorderStyles[ABorder].Color;
colorStr := ColorToHTMLColorStr(rgb, true); colorStr := ColorToExcelStr(rgb);
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<%s style="%s"><color rgb="%s" /></%s>', '<%s style="%s"><color rgb="%s" /></%s>',
[ABorderName, styleName, colorStr, ABorderName] [ABorderName, styleName, colorStr, ABorderName]
@ -4635,11 +4642,11 @@ begin
if FFillList[i]^.Background.FgColor = scTransparent then if FFillList[i]^.Background.FgColor = scTransparent then
fc := 'auto="1"' fc := 'auto="1"'
else else
fc := Format('rgb="%s"', [Copy(ColorToHTMLColorStr(FFillList[i]^.Background.FgColor), 2, MaxInt)]); fc := Format('rgb="%s"', [ColorToExcelStr(FFillList[i]^.Background.FgColor)]);
if FFillList[i]^.Background.BgColor = scTransparent then if FFillList[i]^.Background.BgColor = scTransparent then
bc := 'auto="1"' bc := 'auto="1"'
else else
bc := Format('rgb="%s"', [Copy(ColorToHTMLColorStr(FFillList[i]^.Background.BgColor), 2, MaxInt)]); bc := Format('rgb="%s"', [ColorToExcelStr(FFillList[i]^.Background.BgColor)]);
AppendToStream(AStream, AppendToStream(AStream,
'<fill>'); '<fill>');
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
@ -4681,7 +4688,7 @@ begin
if (fssStrikeout in AFont.Style) then if (fssStrikeout in AFont.Style) then
s := s + '<strike />'; s := s + '<strike />';
if AFont.Color <> scBlack then if AFont.Color <> scBlack then
s := s + Format('<color rgb="%s" />', [Copy(ColorToHTMLColorStr(AFont.Color), 2, MaxInt)]); s := s + Format('<color rgb="%s" />', [ColorToExcelStr(AFont.Color)]);
case AFont.Position of case AFont.Position of
fpSubscript : s := s + '<vertAlign val="subscript" />'; fpSubscript : s := s + '<vertAlign val="subscript" />';
fpSuperscript: s := s + '<vertAlign val="superscript" />'; fpSuperscript: s := s + '<vertAlign val="superscript" />';
@ -5128,7 +5135,7 @@ begin
if s <> '' then s := '<pageSetUpPr' + s + ' />'; if s <> '' then s := '<pageSetUpPr' + s + ' />';
if sheet.TabColor <> scNotDefined then if sheet.TabColor <> scNotDefined then
s := s + Format('<tabColor rgb="%s" />', [Copy(ColorToHTMLColorStr(sheet.TabColor), 2, MaxInt)]); s := s + Format('<tabColor rgb="%s" />', [ColorToExcelStr(sheet.TabColor)]);
if s <> '' then if s <> '' then
AppendToStream(AStream, AppendToStream(AStream,
@ -6562,7 +6569,7 @@ procedure TsSpreadOOXMLWriter.WriteDifferentialFormat(AStream: TStream;
// Border color // Border color
rgb := AFormatRecord^.BorderStyles[ABorder].Color; rgb := AFormatRecord^.BorderStyles[ABorder].Color;
colorStr := ColorToHTMLColorStr(rgb, true); colorStr := ColorToExcelStr(rgb);
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<%s style="%s"><color rgb="%s" /></%s>', '<%s style="%s"><color rgb="%s" /></%s>',
[ABorderName, styleName, colorStr, ABorderName] [ABorderName, styleName, colorStr, ABorderName]
@ -6599,7 +6606,7 @@ begin
AppendToStream(AStream, '<font>'); AppendToStream(AStream, '<font>');
if font.Color <> scNotDefined then if font.Color <> scNotDefined then
begin begin
fc := Copy(ColorToHTMLColorStr(font.Color), 2, MaxInt); fc := ColorToExcelStr(font.Color);
AppendToStream(AStream, Format('<color rgb="%s" />', [fc] )); AppendToStream(AStream, Format('<color rgb="%s" />', [fc] ));
end; end;
if fssBold in font.Style then if fssBold in font.Style then
@ -6629,11 +6636,11 @@ begin
begin begin
pt := PATTERN_TYPES[AFormat^.Background.Style]; pt := PATTERN_TYPES[AFormat^.Background.Style];
if AFormat^.Background.FgColor <> scTransparent then if AFormat^.Background.FgColor <> scTransparent then
fc := Format('rgb="%s"', [Copy(ColorToHTMLColorStr(AFormat^.Background.FgColor), 2, MaxInt)]); fc := Format('rgb="%s"', [ColorToExcelStr(AFormat^.Background.FgColor)]);
if AFormat^.Background.BgColor = scTransparent then if AFormat^.Background.BgColor = scTransparent then
bc := 'auto="1"' bc := 'auto="1"'
else else
bc := Format('rgb="%s"', [Copy(ColorToHTMLColorStr(AFormat^.Background.BgColor), 2, MaxInt)]); bc := Format('rgb="%s"', [ColorToExcelStr(AFormat^.Background.BgColor)]);
AppendToStream(AStream, AppendToStream(AStream,
'<fill>' + Format( '<fill>' + Format(
'<patternFill patternType="%s">', [pt]) + Format( '<patternFill patternType="%s">', [pt]) + Format(