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

fpspreadsheet: Fix comments in ExcelXML writer

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4341 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-09-20 11:19:49 +00:00
parent 265a1270da
commit 995c1a737e
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/fpspreadsheet/xlsxml.pas
View File

@ -271,6 +271,8 @@ var
styleStr: String;
xmlns: String;
dataTagStr: String;
comment: PsComment;
commentStr: String;
begin
if Length(ACell^.RichTextParams) > 0 then
begin
@ -307,9 +309,15 @@ begin
styleStr := Format(' ss:StyleID="s%d"', [ACell^.FormatIndex + FMT_OFFSET]) else
styleStr := '';
comment := FWorksheet.FindComment(ACell);
if Assigned(comment) then
// commentStr := '<Comment><ss:Data xmlns="http://www.w3.org/TR/REC-html40">'+comment^.Text+'</ss:Data></Comment>' else
commentStr := '<Comment><Data>'+comment^.Text+'</Data></Comment>' else
commentStr := '';
AppendToStream(AStream, Format(
' <Cell%s%s><%sData ss:Type="%s"%s>%s</%sData></Cell>' + LineEnding,
[styleStr, formulaStr, dataTagStr, cctStr, xmlns, valueStr, dataTagStr])
' <Cell%s%s><%sData ss:Type="%s"%s>%s</%sData>%s</Cell>' + LineEnding,
[styleStr, formulaStr, dataTagStr, cctStr, xmlns, valueStr, dataTagStr, commentStr])
);
end;
@ -457,6 +465,14 @@ begin
s := s + Format('ss:Size="%g" ', [fnt.Size], FPointSeparatorSettings);
if fnt.Color <> deffnt.Color then
s := s + Format('ss:Color="%s" ', [ColorToHTMLColorStr(fnt.Color)]);
if fssBold in fnt.Style then
s := s + 'ss:Bold="1" ';
if fssItalic in fnt.Style then
s := s + 'ss:Italic="1" ';
if fssUnderline in fnt.Style then
s := s + 'ss:Underline="Single" '; // or "Double", not supported by fps
if fssStrikeout in fnt.Style then
s := s + 'ss:StrikeThrough="1" ';
if s <> '' then
AppendToStream(AStream,
' <Font ' + s + '/>' + LineEnding);