From 6f5068b304a5aa53e48c335624d0a0dc3e3fd48b Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Mon, 4 Apr 2016 09:47:20 +0000 Subject: [PATCH] fpspreadsheet: Avoid ods reader using localized color names. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4606 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/fpsopendocument.pas | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/components/fpspreadsheet/fpsopendocument.pas b/components/fpspreadsheet/fpsopendocument.pas index 514fbca72..e68280c32 100755 --- a/components/fpspreadsheet/fpsopendocument.pas +++ b/components/fpspreadsheet/fpsopendocument.pas @@ -2844,9 +2844,14 @@ procedure TsSpreadOpenDocReader.ReadNumFormats(AStylesNode: TDOMNode); hasColor := true; color := HTMLColorStrToColor(s); case color of - scBlack, scWhite, scRed, scGreen, - scBlue, scYellow, scMagenta, scCyan: - nfs := Format('[%s]%s', [GetColorName(color), nfs]); + scBlack : nfs := '[black]' + nfs; + scWhite : nfs := '[white]' + nfs; + scRed : nfs := '[red]' + nfs; + scGreen : nfs := '[green]' + nfs; + scBlue : nfs := '[blue]' + nfs; + scYellow : nfs := '[yellow]' + nfs; + scMagenta : nfs := '[magenta]' + nfs; + scCyan : nfs := '[cyan]' + nfs; end; end; end;