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

fpspreadsheet: Fix invalid xml characters issue in writing xlsx files (see http://forum.lazarus.freepascal.org/index.php/topic,25110.msg152030.html#msg152030).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3300 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-07-08 20:52:59 +00:00
parent a884bedf92
commit d1ef94451a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
View File

@ -32,6 +32,7 @@ begin
MyWorksheet.WriteNumber(0, 1, 2.0); MyWorksheet.WriteNumber(0, 1, 2.0);
MyWorksheet.WriteNumber(0, 2, 3.0); MyWorksheet.WriteNumber(0, 2, 3.0);
MyWorksheet.WriteNumber(0, 3, 4.0); MyWorksheet.WriteNumber(0, 3, 4.0);
MyWorksheet.WriteUTF8Text(0, 4, '& " '' < >');
MyWorksheet.WriteUTF8Text(0, 26, 'AA'); // Test for column name MyWorksheet.WriteUTF8Text(0, 26, 'AA'); // Test for column name

2
components/fpspreadsheet/xlsxooxml.pas
View File

@ -516,7 +516,7 @@ begin
FSharedStrings := FSharedStrings + FSharedStrings := FSharedStrings +
' <si>' + LineEnding + ' <si>' + LineEnding +
Format(' <t>%s</t>', [ResultingValue]) + LineEnding + Format(' <t>%s</t>', [UTF8TextToXMLText(ResultingValue)]) + LineEnding +
' </si>' + LineEnding; ' </si>' + LineEnding;
CellPosText := TsWorksheet.CellPosToText(ARow, ACol); CellPosText := TsWorksheet.CellPosToText(ARow, ACol);