diff options
| author | Eike Rathke <erack@redhat.com> | 2016-07-25 16:45:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-08-02 16:46:57 +0300 |
| commit | 7e9756043abdfc9dcc540f1102f3d134aeb8afe8 (patch) | |
| tree | bc226711b93169018e5490398693cf5f916ffaf2 | |
| parent | c07d83c4655e83758d4ca9a6555595cda0ba7b9a (diff) | |
Resolves: tdf#101096 remove the "H after M" rule
wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a
Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633
(cherry picked from commit c6e7dbaaa471861dcf76186ed3978ac95f81256e)
Reviewed-on: https://gerrit.libreoffice.org/27529
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 7409b12200121a5be4f6ae66d3bd575904de3770)
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index aeff7d110964..ccdcf303819a 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -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 |