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

fpspreadsheet: Write lower-case year/month/day symbols ("y"/"m"/"d") to date format strings. Issue #36137.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7152 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-10-06 17:49:15 +00:00
parent 7af9da7828
commit c13facb3dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/source/common/fpsnumformat.pas
View File

@ -1473,7 +1473,7 @@ end;
string it is replaced by the localized strings string it is replaced by the localized strings
FormatSettings.TimeAMString/.TimePMString. FormatSettings.TimeAMString/.TimePMString.
@return Excel-compatible format string @return Excel-compatible format string
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------}
function BuildFormatStringFromSection(const ASection: TsNumFormatSection; function BuildFormatStringFromSection(const ASection: TsNumFormatSection;
AllowLocalizedAMPM: Boolean = true): String; AllowLocalizedAMPM: Boolean = true): String;
@ -1527,11 +1527,11 @@ begin
nftText: nftText:
if element.TextValue <> '' then result := Result + '"' + element.TextValue + '"'; if element.TextValue <> '' then result := Result + '"' + element.TextValue + '"';
nftYear: nftYear:
Result := Result + DupeString('Y', element.IntValue); Result := Result + DupeString('y', element.IntValue);
nftMonth: nftMonth:
Result := Result + DupeString('M', element.IntValue); Result := Result + DupeString('m', element.IntValue);
nftDay: nftDay:
Result := Result + DupeString('D', element.IntValue); Result := Result + DupeString('d', element.IntValue);
nftHour: nftHour:
if element.IntValue < 0 if element.IntValue < 0
then Result := Result + '[' + DupeString('h', -element.IntValue) + ']' then Result := Result + '[' + DupeString('h', -element.IntValue) + ']'