[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 17 08:14:51 PST 2012
sc/source/ui/inc/tpformula.hxx | 10 ++--
sc/source/ui/optdlg/tpformula.cxx | 10 ++--
sc/source/ui/src/optdlg.src | 77 +++++++++++++++++++-------------------
3 files changed, 50 insertions(+), 47 deletions(-)
New commits:
commit 7f7a5c3c731d2bea4138181dd71454cd31577a1e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Dec 17 11:15:16 2012 -0500
Re-arranged formula options page to make room for re-calc option.
Change-Id: If144ffa1c5d868f41f6303b0f99fbe2e4d23a6b8
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 646f429..55ea854 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -61,6 +61,11 @@ private:
ListBox maLbFormulaSyntax;
CheckBox maCbEnglishFuncName;
+ FixedLine maFlCustomCalcOpt;
+ RadioButton maBtnCustomCalcDefault;
+ RadioButton maBtnCustomCalcCustom;
+ PushButton maBtnCustomCalcDetails;
+
FixedLine maFlFormulaSeps;
FixedText maFtSepFuncArg;
Edit maEdSepFuncArg;
@@ -70,11 +75,6 @@ private:
Edit maEdSepArrayRow;
PushButton maBtnSepReset;
- FixedLine maFlCustomCalcOpt;
- RadioButton maBtnCustomCalcDefault;
- RadioButton maBtnCustomCalcCustom;
- PushButton maBtnCustomCalcDetails;
-
FixedLine maFlRecalcOptions;
ListBox maLbOOXMLRecalcOptions;
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 5b60bd3..4a9608c 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -48,6 +48,12 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA
maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
maCbEnglishFuncName(this, ScResId(CB_ENGLISH_FUNC_NAME)),
+
+ 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)),
+
maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
@@ -56,10 +62,6 @@ 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)),
maFlRecalcOptions(this, ScResId(FL_RECALC_OPTIONS)),
maLbOOXMLRecalcOptions( this, ScResId(LB_OOXML_RECALC)),
mnDecSep(0)
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 821f200..43cb595 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -201,16 +201,44 @@ TabPage RID_SCPAGE_FORMULA
Text [ en-US ] = "Use English function names" ;
};
+ FixedLine FL_CUSTOM_CALC_OPTIONS
+ {
+ Pos = MAP_APPFONT ( 6 , 47 ) ;
+ Size = MAP_APPFONT ( 140 , 8 ) ;
+ Text [ en-US ] = "Detailed calculation settings";
+ };
+
+ RadioButton BTN_CUSTOM_CALC_DEFAULT
+ {
+ Pos = MAP_APPFONT ( 21 , 62 ) ;
+ Size = MAP_APPFONT ( 60, 14 ) ;
+ Text [ en-US ] = "Default";
+ };
+
+ RadioButton BTN_CUSTOM_CALC_CUSTOM
+ {
+ Pos = MAP_APPFONT ( 21 , 76 ) ;
+ Size = MAP_APPFONT ( 60, 14 ) ;
+ Text [ en-US ] = "Custom";
+ };
+
+ PushButton BTN_CUSTOM_CALC_DETAILS
+ {
+ Pos = MAP_APPFONT ( 83 , 74 ) ;
+ Size = MAP_APPFONT ( 58, 14 ) ;
+ Text [ en-US ] = "Details...";
+ };
+
FixedLine FL_FORMULA_SEPS
{
- Pos = MAP_APPFONT ( 6 , 46 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
+ Pos = MAP_APPFONT ( 154 , 47 ) ;
+ Size = MAP_APPFONT ( 100 , 8 ) ;
Text [ en-US ] = "Separators";
};
FixedText FT_FORMULA_SEP_ARG
{
- Pos = MAP_APPFONT ( 21, 59 );
+ Pos = MAP_APPFONT ( 169, 60 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = "~Function";
};
@@ -218,13 +246,13 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARG
{
Border = TRUE;
- Pos = MAP_APPFONT ( 85, 57 );
+ Pos = MAP_APPFONT ( 233, 58 );
Size = MAP_APPFONT ( 10, 12 );
};
FixedText FT_FORMULA_SEP_ARRAY_C
{
- Pos = MAP_APPFONT ( 21, 77 );
+ Pos = MAP_APPFONT ( 169, 78 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = "Array co~lumn";
};
@@ -232,13 +260,13 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARRAY_C
{
Border = TRUE;
- Pos = MAP_APPFONT ( 85, 75 );
+ Pos = MAP_APPFONT ( 233, 76 );
Size = MAP_APPFONT ( 10, 12 );
};
FixedText FT_FORMULA_SEP_ARRAY_R
{
- Pos = MAP_APPFONT ( 21, 95 );
+ Pos = MAP_APPFONT ( 169, 96 );
Size = MAP_APPFONT ( 60, 8 );
Text [ en-US ] = "Array ~row";
};
@@ -246,53 +274,26 @@ TabPage RID_SCPAGE_FORMULA
Edit ED_FORMULA_SEP_ARRAY_R
{
Border = TRUE;
- Pos = MAP_APPFONT ( 85, 93 );
+ Pos = MAP_APPFONT ( 233, 94 );
Size = MAP_APPFONT ( 10, 12 );
};
PushButton BTN_FORMULA_SEP_RESET
{
- Pos = MAP_APPFONT ( 21, 113 );
+ Pos = MAP_APPFONT ( 169, 114 );
Size = MAP_APPFONT ( 50, 14 );
Text [ en-US ] = "Rese~t";
};
- FixedLine FL_CUSTOM_CALC_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 132 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Detailed calculation settings";
- };
-
- RadioButton BTN_CUSTOM_CALC_DEFAULT
- {
- Pos = MAP_APPFONT ( 21 , 147 ) ;
- Size = MAP_APPFONT ( 60, 14 ) ;
- Text [ en-US ] = "Default";
- };
-
- RadioButton BTN_CUSTOM_CALC_CUSTOM
- {
- Pos = MAP_APPFONT ( 21 , 161 ) ;
- Size = MAP_APPFONT ( 60, 14 ) ;
- Text [ en-US ] = "Custom";
- };
-
- PushButton BTN_CUSTOM_CALC_DETAILS
- {
- Pos = MAP_APPFONT ( 85 , 159 ) ;
- Size = MAP_APPFONT ( 60, 14 ) ;
- Text [ en-US ] = "Details...";
- };
FixedLine FL_RECALC_OPTIONS
{
- Pos = MAP_APPFONT ( 6, 178 );
+ Pos = MAP_APPFONT ( 6, 132 );
Size = MAP_APPFONT( 248, 8 );
Text [ en-US ] = "Recalculation on file load";
};
ListBox LB_OOXML_RECALC
{
- Pos = MAP_APPFONT( 21, 188);
+ Pos = MAP_APPFONT( 21, 147 );
Size = MAP_APPFONT( 100, 50 );
Border = TRUE;
DropDown = TRUE;
More information about the Libreoffice-commits
mailing list