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

fpspreadsheet: Refactor ODS style reading

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7561 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-24 15:21:23 +00:00
parent 175cf1f290
commit 5a5883a156
1 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,8 @@ type
procedure ReadSheets(ANode: TDOMNode); procedure ReadSheets(ANode: TDOMNode);
procedure ReadStyle_ParagraphProperties(ANode: TDOMNode; var AFormat: TsCellFormat); procedure ReadStyle_ParagraphProperties(ANode: TDOMNode; var AFormat: TsCellFormat);
procedure ReadStyle_TableCellProperties(ANode: TDOMNode; var AFormat: TsCellFormat); procedure ReadStyle_TableCellProperties(ANode: TDOMNode; var AFormat: TsCellFormat);
procedure ReadStyle_TextProperties(ANode: TDOMNode; AStyleName: String;
AFont: TsFont; var AFormat: TsCellFormat);
procedure ReadTableStyle(AStyleNode: TDOMNode); procedure ReadTableStyle(AStyleNode: TDOMNode);
protected protected
@ -4980,6 +4982,44 @@ begin
Include(AFormat.UsedFormattingFields, uffProtection); Include(AFormat.UsedFormattingFields, uffProtection);
end; end;
procedure TsSpreadOpenDocReader.ReadStyle_TextProperties(ANode: TDOMNode;
AStyleName: String; AFont: TsFont; var AFormat: TsCellFormat);
var
fntName: String;
fntSize: Single;
fntStyle: TsFontStyles;
fntColor: TsColor;
fntPos: TsFontPosition;
begin
fntName := AFont.FontName;
fntSize := AFont.Size;
fntStyle := AFont.Style;
fntColor := AFont.Color;
fntPos := AFont.Position;
ReadFont(ANode, fntName, fntSize, fntStyle, fntColor, fntPos);
if SameText(AStylename, 'Default') then
begin
TsWorkbook(FWorkbook).ReplaceFont(DEFAULT_FONTINDEX, fntName, fntSize, fntStyle, fntColor, fntPos);
AFormat.FontIndex := DEFAULT_FONTINDEX;
end else
if SameText(AStylename, 'Excel_20_Built-in_20_Hyperlink') then
begin
TsWorkbook(FWorkbook).ReplaceFont(HYPERLINK_FONTINDEX, fntName, fntSize, fntStyle, fntColor, fntPos);
AFormat.FontIndex := HYPERLINK_FONTINDEX;
//fntIndex := ReadFont(styleChildNode, HYPERLINK_FONTINDEX)
end else
begin
AFormat.FontIndex := TsWorkbook(FWorkbook).FindFont(fntName, fntSize, fntStyle, fntColor, fntPos);
if AFormat.FontIndex = -1 then
AFormat.FontIndex := TsWorkbook(FWorkbook).AddFont(fntName, fntSize, fntStyle, fntColor, fntPos);
end;
if AFormat.FontIndex > 0 then
Include(AFormat.UsedFormattingFields, uffFont);
end;
procedure TsSpreadOpenDocReader.ReadStyles(AStylesNode: TDOMNode); procedure TsSpreadOpenDocReader.ReadStyles(AStylesNode: TDOMNode);
var var
styleNode: TDOMNode; styleNode: TDOMNode;
@ -5111,36 +5151,14 @@ begin
while Assigned(styleChildNode) do while Assigned(styleChildNode) do
begin begin
nodeName := styleChildNode.NodeName; nodeName := styleChildNode.NodeName;
if nodeName = 'style:text-properties' then case nodeName of
begin 'style:text-properties':
ReadFont(styleChildNode, fntName, fntSize, fntStyle, fntColor, fntPos); ReadStyle_TextProperties(styleChildNode, styleName, fnt, fmt);
if SameText(stylename, 'Default') then 'style:table-cell-properties':
begin ReadStyle_TableCellProperties(styleChildNode, fmt);
TsWorkbook(FWorkbook).ReplaceFont(DEFAULT_FONTINDEX, fntName, fntSize, fntStyle, fntColor, fntPos); 'style:paragraph-properties':
fmt.FontIndex := DEFAULT_FONTINDEX; ReadStyle_ParagraphProperties(styleChildNode, fmt);
//fntIndex := ReadFont(styleChildNode, DEFAULT_FONTINDEX) end;
end else
if SameText(stylename, 'Excel_20_Built-in_20_Hyperlink') then
begin
TsWorkbook(FWorkbook).ReplaceFont(HYPERLINK_FONTINDEX, fntName, fntSize, fntStyle, fntColor, fntPos);
fmt.FontIndex := HYPERLINK_FONTINDEX;
//fntIndex := ReadFont(styleChildNode, HYPERLINK_FONTINDEX)
end else
begin
fmt.FontIndex := TsWorkbook(FWorkbook).FindFont(fntName, fntSize, fntStyle, fntColor, fntPos);
if fmt.FontIndex = -1 then
fmt.FontIndex := TsWorkbook(FWorkbook).AddFont(fntName, fntSize, fntStyle, fntColor, fntPos);
end;
if fmt.FontIndex > 0 then
Include(fmt.UsedFormattingFields, uffFont);
// fntIndex := ReadFont(styleChildNode);
// fnt := FWorkbook.GetFont(fntIndex);
end else
if nodeName = 'style:table-cell-properties' then
ReadStyle_TableCellProperties(styleChildNode, fmt)
else
if nodeName = 'style:paragraph-properties' then
ReadStyle_ParagraphProperties(styleChildNode, fmt);
styleChildNode := styleChildNode.NextSibling; styleChildNode := styleChildNode.NextSibling;
end; end;
FCellFormatList.Add(fmt); FCellFormatList.Add(fmt);