mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#101096 remove the "H after M" rule

Browse Source 
wrongly introduced with c9ed6e8322

Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633
This commit is contained in:
Eike Rathke
2016-07-25 16:45:32 +02:00
parent bcf84049c8
commit c6e7dbaaa4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
svl/source/numbers/zforscan.cxx
View File

@@ -1146,7 +1146,13 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
break;
case NF_KEY_M: // M
case NF_KEY_MM: // MM
// minute or month
/* Minute or month.
Minute if one of:
* preceded by time keyword H or S (ignoring separators)
* followed by time keyword S (ignoring separators)
* preceded by '[' amount bracket
Else month.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
cChar = PreviousChar(i);
@@ -1154,8 +1160,6 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexPre == NF_KEY_S || // S before M tdf#95339
nIndexPre == NF_KEY_SS || // SS
nIndexNex == NF_KEY_H || // H after M tdf#95339
nIndexNex == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
cChar == '[' ) // [M