diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-24 07:48:47 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-25 13:03:36 +0200 |
| commit | 9430eef53b89bce2e43258d5c4533d655fa80453 (patch) | |
| tree | eaf685f96fe8eb1f2990c49088c22d1e37f3685d | |
| parent | 8242ca4c87428b8c107f9c7ce34797a72ac45cc8 (diff) | |
tdf#143032: Check if the literal is empty
Change-Id: I19a3b1abbe9cda32e012be23fc98baa20108f532
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117723
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 19ee2134df35..9395299afd16 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3291,7 +3291,8 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r case NF_KEY_MMMMM: if ((i < nCount-1 && rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING && - // Literal following, not space nor comma. + // Literal following, not empty, space nor comma. + !rInfo.sStrArray[i+1].isEmpty() && rInfo.sStrArray[i+1][0] != ' ' && rInfo.sStrArray[i+1][0] != ',') || (i > 0 && rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING && ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) && |