From 2ee9a0adacb6b163591ff0cbc1a0843c478403fb Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Mon, 23 Jul 2012 18:10:08 -0400 Subject: Using ScCalcConfig throughout saves quite a bit of code. Change-Id: I697b03d603a99cdb58c31d78447bbed10230311e --- sc/inc/formulaopt.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sc/inc/formulaopt.hxx') diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 5ca55a3e8905..7cc2dd8fe7fe 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -35,13 +35,14 @@ #include "formula/grammar.hxx" #include "scdllapi.h" #include "global.hxx" +#include "calcconfig.hxx" class SC_DLLPUBLIC ScFormulaOptions { private: bool bUseEnglishFuncName; // use English function name even if the locale is not English. formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax - formula::FormulaGrammar::AddressConvention eStringRefSyntax; + ScCalcConfig aCalcConfig; ::rtl::OUString aFormulaSepArg; ::rtl::OUString aFormulaSepArrayRow; @@ -57,8 +58,9 @@ public: void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; } ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; } - void SetStringRefAddressSyntax(formula::FormulaGrammar::AddressConvention eConv) { eStringRefSyntax = eConv; } - formula::FormulaGrammar::AddressConvention GetStringRefAddressSyntax() const { return eStringRefSyntax; } + ScCalcConfig& GetCalcConfig() { return aCalcConfig; } + const ScCalcConfig& GetCalcConfig() const { return aCalcConfig; } + void SetCalcConfig(const ScCalcConfig& rConfig) { aCalcConfig = rConfig; } void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; } bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; } -- cgit v1.2.3