diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-31 21:41:48 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-31 21:43:48 -0400 |
commit | e6ef9f128e85961921b0b319087010fce1d59a74 (patch) | |
tree | e2aa331905ea64b909e85bb3945bf58f16f72135 /sc | |
parent | 02bd365494a59bb9080a4d73eafbde7903bd2cc9 (diff) |
Rename this option to make it sound more generic.
There may be other functions other than INDIRECT that take a string
reference. If so, we could re-use this option for those functions
as well.
Change-Id: I1e756298a094aa8197f578cb992904b7af5b2e4d
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/calcconfig.hxx | 2 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 6 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/calcconfig.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 32 | ||||
-rw-r--r-- | sc/source/core/tool/interpr1.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hrc | 4 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.src | 8 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpformula.cxx | 6 |
12 files changed, 45 insertions, 45 deletions
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 7dd52ce80880..48d474616799 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -37,7 +37,7 @@ */ struct SC_DLLPUBLIC ScCalcConfig { - formula::FormulaGrammar::AddressConvention meIndirectRefSyntax; + formula::FormulaGrammar::AddressConvention meStringRefAddressSyntax; ScCalcConfig(); diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 8186d8aab6cf..5ca55a3e8905 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -41,7 +41,7 @@ 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 eIndirectFuncRefSyntax; + formula::FormulaGrammar::AddressConvention eStringRefSyntax; ::rtl::OUString aFormulaSepArg; ::rtl::OUString aFormulaSepArrayRow; @@ -57,8 +57,8 @@ public: void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; } ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; } - void SetIndirectFuncSyntax(formula::FormulaGrammar::AddressConvention eConv) { eIndirectFuncRefSyntax = eConv; } - formula::FormulaGrammar::AddressConvention GetIndirectFuncSyntax() const { return eIndirectFuncRefSyntax; } + void SetStringRefAddressSyntax(formula::FormulaGrammar::AddressConvention eConv) { eStringRefSyntax = eConv; } + formula::FormulaGrammar::AddressConvention GetStringRefAddressSyntax() const { return eStringRefSyntax; } void SetUseEnglishFuncName( bool bVal ) { bUseEnglishFuncName = bVal; } bool GetUseEnglishFuncName() const { return bUseEnglishFuncName; } diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 2d81aa1b3f37..71014a18320d 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -868,7 +868,7 @@ void testFuncINDIRECT(ScDocument* pDoc) } ScCalcConfig aConfig; - aConfig.meIndirectRefSyntax = formula::FormulaGrammar::CONV_OOO; + aConfig.meStringRefAddressSyntax = formula::FormulaGrammar::CONV_OOO; ScInterpreter::SetGlobalConfig(aConfig); pDoc->CalcAll(); { @@ -884,7 +884,7 @@ void testFuncINDIRECT(ScDocument* pDoc) } } - aConfig.meIndirectRefSyntax = formula::FormulaGrammar::CONV_XL_A1; + aConfig.meStringRefAddressSyntax = formula::FormulaGrammar::CONV_XL_A1; ScInterpreter::SetGlobalConfig(aConfig); pDoc->CalcAll(); { @@ -900,7 +900,7 @@ void testFuncINDIRECT(ScDocument* pDoc) } } - aConfig.meIndirectRefSyntax = formula::FormulaGrammar::CONV_XL_R1C1; + aConfig.meStringRefAddressSyntax = formula::FormulaGrammar::CONV_XL_R1C1; ScInterpreter::SetGlobalConfig(aConfig); pDoc->CalcAll(); { diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 3f0fd3547adb..660869a70a2d 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -29,7 +29,7 @@ #include "calcconfig.hxx" ScCalcConfig::ScCalcConfig() : - meIndirectRefSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED) {} + meStringRefAddressSyntax(formula::FormulaGrammar::CONV_UNSPECIFIED) {} void ScCalcConfig::reset() { @@ -38,7 +38,7 @@ void ScCalcConfig::reset() bool ScCalcConfig::operator== (const ScCalcConfig& r) const { - return meIndirectRefSyntax == r.meIndirectRefSyntax; + return meStringRefAddressSyntax == r.meStringRefAddressSyntax; } bool ScCalcConfig::operator!= (const ScCalcConfig& r) const diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index bc706dca0958..739758bdb96a 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -55,7 +55,7 @@ ScFormulaOptions::ScFormulaOptions() ScFormulaOptions::ScFormulaOptions( const ScFormulaOptions& rCpy ) : bUseEnglishFuncName ( rCpy.bUseEnglishFuncName ), eFormulaGrammar ( rCpy.eFormulaGrammar ), - eIndirectFuncRefSyntax(rCpy.eIndirectFuncRefSyntax), + eStringRefSyntax(rCpy.eStringRefSyntax), aFormulaSepArg ( rCpy.aFormulaSepArg ), aFormulaSepArrayRow ( rCpy.aFormulaSepArrayRow ), aFormulaSepArrayCol ( rCpy.aFormulaSepArrayCol ) @@ -72,7 +72,7 @@ void ScFormulaOptions::SetDefaults() eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE; // unspecified means use the current formula syntax. - eIndirectFuncRefSyntax = formula::FormulaGrammar::CONV_UNSPECIFIED; + eStringRefSyntax = formula::FormulaGrammar::CONV_UNSPECIFIED; ResetFormulaSeparators(); } @@ -144,7 +144,7 @@ ScFormulaOptions& ScFormulaOptions::operator=( const ScFormulaOptions& rCpy ) { bUseEnglishFuncName = rCpy.bUseEnglishFuncName; eFormulaGrammar = rCpy.eFormulaGrammar; - eIndirectFuncRefSyntax = rCpy.eIndirectFuncRefSyntax; + eStringRefSyntax = rCpy.eStringRefSyntax; aFormulaSepArg = rCpy.aFormulaSepArg; aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow; aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol; @@ -155,7 +155,7 @@ bool ScFormulaOptions::operator==( const ScFormulaOptions& rOpt ) const { return bUseEnglishFuncName == rOpt.bUseEnglishFuncName && eFormulaGrammar == rOpt.eFormulaGrammar - && eIndirectFuncRefSyntax == rOpt.eIndirectFuncRefSyntax + && eStringRefSyntax == rOpt.eStringRefSyntax && aFormulaSepArg == rOpt.aFormulaSepArg && aFormulaSepArrayRow == rOpt.aFormulaSepArrayRow && aFormulaSepArrayCol == rOpt.aFormulaSepArrayCol; @@ -212,19 +212,19 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const #define SCFORMULAOPT_SEP_ARG 2 #define SCFORMULAOPT_SEP_ARRAY_ROW 3 #define SCFORMULAOPT_SEP_ARRAY_COL 4 -#define SCFORMULAOPT_INDIRECT_GRAMMAR 5 +#define SCFORMULAOPT_STRING_REF_SYNTAX 5 #define SCFORMULAOPT_COUNT 6 Sequence<OUString> ScFormulaCfg::GetPropertyNames() { static const char* aPropNames[] = { - "Syntax/Grammar", // SCFORMULAOPT_GRAMMAR - "Syntax/EnglishFunctionName", // SCFORMULAOPT_ENGLISH_FUNCNAME - "Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG - "Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW - "Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL - "Syntax/IndirectFuncGrammar", // SCFORMULAOPT_INDIRECT_GRAMMAR + "Syntax/Grammar", // SCFORMULAOPT_GRAMMAR + "Syntax/EnglishFunctionName", // SCFORMULAOPT_ENGLISH_FUNCNAME + "Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG + "Syntax/SeparatorArrayRow", // SCFORMULAOPT_SEP_ARRAY_ROW + "Syntax/SeparatorArrayCol", // SCFORMULAOPT_SEP_ARRAY_COL + "Syntax/StringRefAddressSyntax", // SCFORMULAOPT_STRING_REF_SYNTAX }; Sequence<OUString> aNames(SCFORMULAOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -308,10 +308,10 @@ ScFormulaCfg::ScFormulaCfg() : SetFormulaSepArrayCol(aSep); } break; - case SCFORMULAOPT_INDIRECT_GRAMMAR: + case SCFORMULAOPT_STRING_REF_SYNTAX: { // Get default value in case this option is not set. - ::formula::FormulaGrammar::AddressConvention eConv = GetIndirectFuncSyntax(); + ::formula::FormulaGrammar::AddressConvention eConv = GetStringRefAddressSyntax(); do { @@ -338,7 +338,7 @@ ScFormulaCfg::ScFormulaCfg() : } } while (false); - SetIndirectFuncSyntax(eConv); + SetStringRefAddressSyntax(eConv); } break; } @@ -384,10 +384,10 @@ void ScFormulaCfg::Commit() case SCFORMULAOPT_SEP_ARRAY_COL: pValues[nProp] <<= GetFormulaSepArrayCol(); break; - case SCFORMULAOPT_INDIRECT_GRAMMAR: + case SCFORMULAOPT_STRING_REF_SYNTAX: { sal_Int32 nVal = -1; - switch (GetIndirectFuncSyntax()) + switch (GetStringRefAddressSyntax()) { case ::formula::FormulaGrammar::CONV_OOO: nVal = 0; break; case ::formula::FormulaGrammar::CONV_XL_A1: nVal = 1; break; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index c689df990a90..34675c9c0784 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -6969,7 +6969,7 @@ void ScInterpreter::ScIndirect() if ( MustHaveParamCount( nParamCount, 1, 2 ) ) { // Reference address syntax for INDIRECT is configurable. - FormulaGrammar::AddressConvention eConv = GetGlobalConfig().meIndirectRefSyntax; + FormulaGrammar::AddressConvention eConv = GetGlobalConfig().meStringRefAddressSyntax; if (eConv == FormulaGrammar::CONV_UNSPECIFIED) // Use the current address syntax if unspecified. eConv = pDok->GetAddressConvention(); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1cdaf4ac182c..01da06a540f6 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -509,7 +509,7 @@ void ScDocShell::SetFormulaOptions(const ScFormulaOptions& rOpt ) // Global interpreter settings. ScCalcConfig aConfig; - aConfig.meIndirectRefSyntax = rOpt.GetIndirectFuncSyntax(); + aConfig.meStringRefAddressSyntax = rOpt.GetStringRefAddressSyntax(); ScInterpreter::SetGlobalConfig(aConfig); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index d3eeaa5cadc2..2b75082c6ade 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -94,8 +94,8 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC maCalcA1(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString()), maExcelA1(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString()), maExcelR1C1(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString()), - maCaptionIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_CAPTION).toString()), - maDescIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_DESC).toString()), + maCaptionStringRefSyntax(ScResId(STR_STRING_REF_SYNTAX_CAPTION).toString()), + maDescStringRefSyntax(ScResId(STR_STRING_REF_SYNTAX_DESC).toString()), maUseFormulaSyntax(ScResId(STR_USE_FORMULA_SYNTAX).toString()), maConfig(rConfig) { @@ -131,7 +131,7 @@ void ScCalcOptionsDialog::FillOptionsList() pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString())); pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0)); OptionString* pItem = new OptionString( - maCaptionIndirectSyntax, toString(maConfig.meIndirectRefSyntax)); + maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax)); pEntry->AddItem(pItem); pModel->Insert(pEntry); } @@ -149,7 +149,7 @@ void ScCalcOptionsDialog::SelectionChanged() maLbOptionEdit.InsertEntry(maCalcA1); maLbOptionEdit.InsertEntry(maExcelA1); maLbOptionEdit.InsertEntry(maExcelR1C1); - switch (maConfig.meIndirectRefSyntax) + switch (maConfig.meStringRefAddressSyntax) { case formula::FormulaGrammar::CONV_OOO: maLbOptionEdit.SelectEntryPos(1); @@ -164,7 +164,7 @@ void ScCalcOptionsDialog::SelectionChanged() default: maLbOptionEdit.SelectEntryPos(0); } - maFtAnnotation.SetText(maDescIndirectSyntax); + maFtAnnotation.SetText(maDescStringRefSyntax); } } @@ -174,7 +174,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged() { // Formula syntax for INDIRECT function. sal_uInt16 nPos = maLbOptionEdit.GetSelectEntryPos(); - maConfig.meIndirectRefSyntax = toAddressConvention(nPos); + maConfig.meStringRefAddressSyntax = toAddressConvention(nPos); maLbSettings.SetUpdateMode(false); @@ -184,7 +184,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged() return; OptionString* pItem = new OptionString( - maCaptionIndirectSyntax, toString(maConfig.meIndirectRefSyntax)); + maCaptionStringRefSyntax, toString(maConfig.meStringRefAddressSyntax)); pEntry->ReplaceItem(pItem, 2); maLbSettings.SetUpdateMode(true); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hrc b/sc/source/ui/optdlg/calcoptionsdlg.hrc index 9620d49aa8cc..6d878683b6be 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hrc +++ b/sc/source/ui/optdlg/calcoptionsdlg.hrc @@ -38,8 +38,8 @@ #define FL_ANNOTATION 20 #define FT_ANNOTATION 21 -#define STR_INDIRECT_SYNTAX_CAPTION 22 -#define STR_INDIRECT_SYNTAX_DESC 23 +#define STR_STRING_REF_SYNTAX_CAPTION 22 +#define STR_STRING_REF_SYNTAX_DESC 23 #define STR_USE_FORMULA_SYNTAX 24 diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index d80def876680..a1e3cfc5c448 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -69,8 +69,8 @@ private: rtl::OUString maExcelA1; rtl::OUString maExcelR1C1; - rtl::OUString maCaptionIndirectSyntax; - rtl::OUString maDescIndirectSyntax; + rtl::OUString maCaptionStringRefSyntax; + rtl::OUString maDescStringRefSyntax; rtl::OUString maUseFormulaSyntax; ScCalcConfig maConfig; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.src b/sc/source/ui/optdlg/calcoptionsdlg.src index 7c8c1d9e3748..621bc0d0abc4 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.src +++ b/sc/source/ui/optdlg/calcoptionsdlg.src @@ -89,14 +89,14 @@ ModalDialog RID_SCDLG_FORMULA_CALCOPTIONS TabStop = TRUE ; }; - String STR_INDIRECT_SYNTAX_CAPTION + String STR_STRING_REF_SYNTAX_CAPTION { - Text [ en-US ] = "Formula syntax for INDIRECT function"; + Text [ en-US ] = "Reference syntax for string reference"; }; - String STR_INDIRECT_SYNTAX_DESC + String STR_STRING_REF_SYNTAX_DESC { - Text [ en-US ] = "Formula syntax that built-in function INDIRECT expects."; + Text [ en-US ] = "Formula syntax to use when parsing references given in string paramters. This affects built-in functions such as INDIRECT that takes a reference as a string value."; }; String STR_USE_FORMULA_SYNTAX diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 61d05feead4f..59c1d8ca9e0d 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -291,7 +291,7 @@ sal_Bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) aOpt.SetFormulaSepArg(aSep); aOpt.SetFormulaSepArrayCol(aSepArrayCol); aOpt.SetFormulaSepArrayRow(aSepArrayRow); - aOpt.SetIndirectFuncSyntax(maCurrentConfig.meIndirectRefSyntax); + aOpt.SetStringRefAddressSyntax(maCurrentConfig.meStringRefAddressSyntax); rCoreSet.Put( ScTpFormulaItem( SID_SCFORMULAOPTIONS, aOpt ) ); bRet = true; @@ -353,8 +353,8 @@ void ScTpFormulaOptions::Reset(const SfxItemSet& rCoreSet) // detailed calc settings. ScFormulaOptions aDefaults; - maSavedConfig.meIndirectRefSyntax = aOpt.GetIndirectFuncSyntax(); - bool bDefault = aDefaults.GetIndirectFuncSyntax() == maSavedConfig.meIndirectRefSyntax; + maSavedConfig.meStringRefAddressSyntax = aOpt.GetStringRefAddressSyntax(); + bool bDefault = aDefaults.GetStringRefAddressSyntax() == maSavedConfig.meStringRefAddressSyntax; UpdateCustomCalcRadioButtons(bDefault); maCurrentConfig = maSavedConfig; |