From 7409b12200121a5be4f6ae66d3bd575904de3770 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 25 Jul 2016 16:45:32 +0200 Subject: Resolves: tdf#101096 remove the "H after M" rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633 (cherry picked from commit c6e7dbaaa471861dcf76186ed3978ac95f81256e) Reviewed-on: https://gerrit.libreoffice.org/27529 Reviewed-by: Caolán McNamara Reviewed-by: Miklos Vajna Reviewed-by: jan iversen Tested-by: jan iversen --- svl/source/numbers/zforscan.cxx | 10 +++++++--- 1 file 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 -- cgit