diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-05-19 22:57:30 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 15:43:13 +0000 |
| commit | d31f8efabd895ae0f14ae64e6caf1cfc78bf53a5 (patch) | |
| tree | 2ba64955b776e377d70a4cb0100f324267322396 /svl | |
| parent | tdf#61996 Skip quoted text in number format (diff) | |
| download | core-d31f8efabd895ae0f14ae64e6caf1cfc78bf53a5.tar.gz core-d31f8efabd895ae0f14ae64e6caf1cfc78bf53a5.zip | |
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@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c9ed6e832213129cc579c1c309ce9dbd3593c57a)
Reviewed-on: https://gerrit.libreoffice.org/25448
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforscan.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 3dd3d7c08d05..aeff7d110964 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 |