diff options
| author | Albert Thuswaldner <albert.thuswaldner@gmail.com> | 2012-02-25 01:07:18 +0100 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-27 12:13:29 -0500 |
| commit | b091acc26d145f2194662df64806f09fb78ef006 (patch) | |
| tree | bfd498cff3ee2f790cfabb504aab5671ab03cfc4 /sc/source/ui/docshell | |
| parent | 660e4481a4ab00b1077dbc5e26568b7f6f05b2ba (diff) | |
Moving misplaced Formula options from ScDocOptions to ScAppOptions
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index afbbf21b934e..c02956cc4236 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -47,7 +47,7 @@ #include "viewdata.hxx" #include "tabvwsh.hxx" #include "tablink.hxx" -#include "docoptio.hxx" +#include "appoptio.hxx" #include "globstr.hrc" #include "scmod.hxx" @@ -495,19 +495,18 @@ void ScDocShell::CheckConfigOptions() OUString aDecSep = ScGlobal::GetpLocaleData()->getNumDecimalSep(); ScModule* pScMod = SC_MOD(); - const ScDocOptions& rOpt = pScMod->GetDocOptions(); - OUString aSepArg = rOpt.GetFormulaSepArg(); - OUString aSepArrRow = rOpt.GetFormulaSepArrayRow(); - OUString aSepArrCol = rOpt.GetFormulaSepArrayCol(); + const ScAppOptions& rAppOpt=pScMod->GetAppOptions(); + OUString aSepArg = rAppOpt.GetFormulaSepArg(); + OUString aSepArrRow = rAppOpt.GetFormulaSepArrayRow(); + OUString aSepArrCol = rAppOpt.GetFormulaSepArrayCol(); if (aDecSep == aSepArg || aDecSep == aSepArrRow || aDecSep == aSepArrCol) { // One of arg separators conflicts with the current decimal // separator. Reset them to default. - ScDocOptions aNew = rOpt; + ScAppOptions aNew = rAppOpt; aNew.ResetFormulaSeparators(); - aDocument.SetDocOptions(aNew); - pScMod->SetDocOptions(aNew); + pScMod->SetAppOptions(aNew); // Launch a nice warning dialog to let the users know of this change. ScTabViewShell* pViewShell = GetBestViewShell(); |