summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2021-06-11 22:22:13 +0200
committerEike Rathke <erack@redhat.com>2021-06-11 23:50:44 +0200
commit381bc9d9acd461415cf81eef71ec3dd935a07b62 (patch)
tree46475e97d86649fcdb4e499851365ec2b5ad6900
parent6804eb2c740d2b2310399ae14bfa0bb2e6e24a91 (diff)
Related: tdf#127013 Check loaded separators for validity
... not only if something is present at all. That way future restrictions can reset separators. Change-Id: I738bcb9e052e8dbecb0a6cd07bbae8f4a8ea1c35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117072 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2f24e0714e71..c7d29e03dbc6 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -372,9 +372,9 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet)
OUString aSepArrayRow = aOpt.GetFormulaSepArrayRow();
OUString aSepArrayCol = aOpt.GetFormulaSepArrayCol();
- if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
+ if (IsValidSeparator(aSep, false) && IsValidSeparator(aSepArrayRow, true) && IsValidSeparator(aSepArrayCol, true))
{
- // Each separator must be one character long.
+ // Each and all separators must be valid.
mxEdSepFuncArg->set_text(aSep);
mxEdSepArrayCol->set_text(aSepArrayCol);
mxEdSepArrayRow->set_text(aSepArrayRow);