summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-10-27 15:31:29 +0200
committerEike Rathke <erack@redhat.com>2017-10-27 18:29:44 +0200
commit5ab5243068ff0e023da35633922f140688c7fcbd (patch)
treeb8bfa0e7786ca760cb13956b7bc6aae8f294189b
parent0ce0999fa2ace834558f9e79053df60b60623950 (diff)
Check decimalSeparatorAlternative in CheckConfigOptions(), tdf#81671
Change-Id: I5281a6e63e1cff8ae47f1b79eb4fdb5e7eaa074b
-rw-r--r--sc/source/ui/docshell/docsh6.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 9ec7631aa749..6b611373cd05 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -476,6 +476,7 @@ void ScDocShell::CheckConfigOptions()
return;
OUString aDecSep = ScGlobal::GetpLocaleData()->getNumDecimalSep();
+ OUString aDecSepAlt = ScGlobal::GetpLocaleData()->getNumDecimalSepAlt();
ScModule* pScMod = SC_MOD();
const ScFormulaOptions& rOpt=pScMod->GetFormulaOptions();
@@ -483,7 +484,8 @@ void ScDocShell::CheckConfigOptions()
const OUString& aSepArrRow = rOpt.GetFormulaSepArrayRow();
const OUString& aSepArrCol = rOpt.GetFormulaSepArrayCol();
- if (aDecSep == aSepArg || aDecSep == aSepArrRow || aDecSep == aSepArrCol)
+ if (aDecSep == aSepArg || aDecSep == aSepArrRow || aDecSep == aSepArrCol ||
+ aDecSepAlt == aSepArg || aDecSepAlt == aSepArrRow || aDecSepAlt == aSepArrCol)
{
// One of arg separators conflicts with the current decimal
// separator. Reset them to default.