[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svl/source

[Laurent Balland-Poirier]

 svl/source/numbers/zforscan.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d31f8efabd895ae0f14ae64e6caf1cfc78bf53a5
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Thu May 19 22:57:30 2016 +0200

    tdf#95339 Extend test to distinguish minute/month
    
    Detect minute in user number format such as SSMM or MMHH
    
    Change-Id: Iadb29dabba167b8f59903ff05e7367857378738a
    Reviewed-on: https://gerrit.libreoffice.org/25222
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit c9ed6e832213129cc579c1c309ce9dbd3593c57a)
    Reviewed-on: https://gerrit.libreoffice.org/25448
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 3dd3d7c..aeff7d1 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1152,6 +1152,10 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
                 cChar = PreviousChar(i);
                 if (nIndexPre == NF_KEY_H   ||      // H
                     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