diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr index 8e54ab8d0..1915f2bce 100644 --- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr +++ b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr @@ -32,6 +32,7 @@ begin MyWorksheet.WriteNumber(0, 1, 2.0); MyWorksheet.WriteNumber(0, 2, 3.0); MyWorksheet.WriteNumber(0, 3, 4.0); + MyWorksheet.WriteUTF8Text(0, 4, '& " '' < >'); MyWorksheet.WriteUTF8Text(0, 26, 'AA'); // Test for column name diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas index 0da01d645..2d00bc186 100755 --- a/components/fpspreadsheet/xlsxooxml.pas +++ b/components/fpspreadsheet/xlsxooxml.pas @@ -516,7 +516,7 @@ begin FSharedStrings := FSharedStrings + ' ' + LineEnding + - Format(' %s', [ResultingValue]) + LineEnding + + Format(' %s', [UTF8TextToXMLText(ResultingValue)]) + LineEnding + ' ' + LineEnding; CellPosText := TsWorksheet.CellPosToText(ARow, ACol);