svl/source/numbers/zforscan.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c6e7dbaaa471861dcf76186ed3978ac95f81256e
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jul 25 16:45:32 2016 +0200
Resolves: tdf#101096 remove the "H after M" rule
wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a
Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index bc43643..000755a 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
