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

fpspreadsheet: Refactor ODS number format writing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7567 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-26 12:25:06 +00:00
parent 390c7b935a
commit cbfea142d0
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,6 +237,7 @@ type
function WriteFontStyleXMLAsString(AFont: TsFont): String; overload; function WriteFontStyleXMLAsString(AFont: TsFont): String; overload;
function WriteHeaderFooterFontXMLAsString(AFont: TsHeaderFooterFont): String; function WriteHeaderFooterFontXMLAsString(AFont: TsHeaderFooterFont): String;
function WriteHorAlignmentStyleXMLAsString(const AFormat: TsCellFormat): String; function WriteHorAlignmentStyleXMLAsString(const AFormat: TsCellFormat): String;
function WriteNumFormatStyleXMLAsString(const AFormat: TsCellFormat): String;
function WritePageLayoutXMLAsString(AStyleName: String; const APageLayout: TsPageLayout): String; function WritePageLayoutXMLAsString(AStyleName: String; const APageLayout: TsPageLayout): String;
function WritePrintRangesXMLAsString(ASheet: TsBasicWorksheet): String; function WritePrintRangesXMLAsString(ASheet: TsBasicWorksheet): String;
function WriteSheetProtectionXMLAsString(ASheet: TsBasicWorksheet): String; function WriteSheetProtectionXMLAsString(ASheet: TsBasicWorksheet): String;
@ -5835,6 +5836,8 @@ var
begin begin
addProtection := (AConditionalFormatIndex = -1); addProtection := (AConditionalFormatIndex = -1);
nfs := WriteNumFormatStyleXMLAsString(AFormat);
{
nfs := ''; nfs := '';
nfidx := AFormat.NumberFormatIndex; nfidx := AFormat.NumberFormatIndex;
if nfidx <> -1 then if nfidx <> -1 then
@ -5858,7 +5861,7 @@ begin
nfs := ''; nfs := '';
end; end;
end; end;
}
AppendToStream(AStream, Format( AppendToStream(AStream, Format(
'<style:style style:name="%s" style:family="table-cell" ' + '<style:style style:name="%s" style:family="table-cell" ' +
'style:parent-style-name="Default"%s>', 'style:parent-style-name="Default"%s>',
@ -8164,6 +8167,36 @@ begin
end; end;
end; end;
function TsSpreadOpenDocWriter.WriteNumFormatStyleXMLAsString(
const AFormat: TsCellFormat): String;
var
nfParams: TsNumFormatParams;
nfs: String;
j: Integer;
s: String;
p: Integer;
begin
Result := '';
if not (uffNumberFormat in AFormat.UsedFormattingFields) then
exit;
nfParams := TsWorkbook(FWorkbook).GetNumberFormat(AFormat.NumberFormatIndex);
if nfParams <> nil then
begin
nfs := nfParams.NumFormatStr;
for j:=0 to NumFormatList.Count-1 do
begin
s := NumFormatList[j];
p := pos(':', s);
if SameText(Copy(s, p+1, Length(s)), nfs) then
begin
Result := Format(' style:data-style-name="%s"', [copy(s, 1, p-1)]);
Exit;
end;
end;
end;
end;
function TsSpreadOpenDocWriter.WritePageLayoutXMLAsString(AStyleName: String; function TsSpreadOpenDocWriter.WritePageLayoutXMLAsString(AStyleName: String;
const APageLayout: TsPageLayout): String; const APageLayout: TsPageLayout): String;