diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-26 00:15:55 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-30 11:37:18 -0400 |
| commit | 805ec73aa824e7c14dc867fbf2a7f5f67fb06c7a (patch) | |
| tree | 91d3db1a8de6f6e02ca4c75897acadfbe84a7cf6 | |
| parent | 769e71ff8c06b9c23e25d7188f565d2879550000 (diff) | |
New controls in formula option page to change calculation settings.
Change-Id: I4743cfc75796a989657afbbc3efc14dfe9f8c114
| -rw-r--r-- | sc/source/ui/inc/optdlg.hrc | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/tpformula.hxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpformula.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/src/optdlg.src | 28 |
4 files changed, 41 insertions, 0 deletions
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index 5245bc6d69ad..34ccbfc5d63c 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -188,6 +188,10 @@ #define FT_FORMULA_SEP_ARRAY_C 89 #define ED_FORMULA_SEP_ARRAY_C 90 #define BTN_FORMULA_SEP_RESET 91 +#define FL_CUSTOM_CALC_OPTIONS 92 +#define BTN_CUSTOM_CALC_DEFAULT 93 +#define BTN_CUSTOM_CALC_CUSTOM 94 +#define BTN_CUSTOM_CALC_DETAILS 95 // TP_COMPATIBILITY #define FL_KEY_BINDINGS 1 diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index c547849bf65c..7dda2e350f28 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -75,6 +75,11 @@ private: Edit maEdSepArrayRow; PushButton maBtnSepReset; + FixedLine maFlCustomCalcOpt; + RadioButton maBtnCustomCalcDefault; + RadioButton maBtnCustomCalcCustom; + PushButton maBtnCustomCalcDetails; + /** Stores old separator value of currently focused separator edit box. This value is used to revert undesired value change. */ ::rtl::OUString maOldSepValue; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index c029c81b5d55..77c571f402bb 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -66,6 +66,10 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)), maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)), maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)), + maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)), + maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)), + maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)), + maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)), mnDecSep(0) { diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src index d27da144469c..eddda53aa932 100644 --- a/sc/source/ui/src/optdlg.src +++ b/sc/source/ui/src/optdlg.src @@ -283,6 +283,34 @@ TabPage RID_SCPAGE_FORMULA Size = MAP_APPFONT ( 50, 14 ); Text [ en-US ] = "Rese~t"; }; + + FixedLine FL_CUSTOM_CALC_OPTIONS + { + Pos = MAP_APPFONT ( 6 , 138 ) ; + Size = MAP_APPFONT ( 248 , 8 ) ; + Text [ en-US ] = "Detailed calculation settings"; + }; + + RadioButton BTN_CUSTOM_CALC_DEFAULT + { + Pos = MAP_APPFONT ( 21 , 153 ) ; + Size = MAP_APPFONT ( 60, 14 ) ; + Text [ en-US ] = "Default"; + }; + + RadioButton BTN_CUSTOM_CALC_CUSTOM + { + Pos = MAP_APPFONT ( 21 , 167 ) ; + Size = MAP_APPFONT ( 60, 14 ) ; + Text [ en-US ] = "Custom"; + }; + + PushButton BTN_CUSTOM_CALC_DETAILS + { + Pos = MAP_APPFONT ( 85 , 165 ) ; + Size = MAP_APPFONT ( 60, 14 ) ; + Text [ en-US ] = "Details..."; + }; }; TabPage RID_SCPAGE_COMPATIBILITY |