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

fpspreadsheet: Combine percentage format detection with other number formats (for ods)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3140 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2014-06-05 07:58:18 +00:00
parent 0aeefd619f
commit bac68e48c5
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpspreadsheet/fpsopendocument.pas
View File

@ -1020,6 +1020,9 @@ procedure TsSpreadOpenDocReader.ReadNumFormats(AStylesNode: TDOMNode);
if node <> nil then if node <> nil then
ReadStyleMap(node, nf, fmt); ReadStyleMap(node, nf, fmt);
if ANumFormatNode.NodeName = 'number:percentage-style' then
nf := nfPercentage;
NumFormatList.AddFormat(ANumFormatName, fmt, nf, decs); NumFormatList.AddFormat(ANumFormatName, fmt, nf, decs);
end; end;
@ -1215,14 +1218,12 @@ begin
numfmtName := GetAttrValue(NumFormatNode, 'style:name') else numfmtName := GetAttrValue(NumFormatNode, 'style:name') else
numfmtName := ''; numfmtName := '';
// Numbers (nfFixed, nfFixedTh, nfExp) // Numbers (nfFixed, nfFixedTh, nfExp, nfPercentage)
if numfmt_nodename = 'number:number-style' then if (numfmt_nodename = 'number:number-style') or
(numfmt_nodename = 'number:percentage-style')
then
ReadNumberStyle(NumFormatNode, numfmtName); ReadNumberStyle(NumFormatNode, numfmtName);
// Percentage
if numfmt_nodename = 'number:percentage-style' then
ReadPercentageStyle(NumFormatNode, numfmtName);
// Date/time values // Date/time values
if (numfmt_nodename = 'number:date-style') or (numfmt_nodename = 'number:time-style') then if (numfmt_nodename = 'number:date-style') or (numfmt_nodename = 'number:time-style') then
ReadDateTimeStyle(NumFormatNode, numfmtName); ReadDateTimeStyle(NumFormatNode, numfmtName);