Resolves: #i117782# convert calculate page to .ui format

Change-Id: Iab0028ad1bfd8a841a3cf87aadbe0dc9d9ad830e

3 files changed, 20 insertions, 46 deletions

diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index aae8affce186..97aebe70fcec 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -29,6 +29,7 @@ class ScDoubleField : public Edit
 {
 public:
     explicit            ScDoubleField( Window* pParent, const ResId& rResId );
+    explicit            ScDoubleField( Window* pParent, WinBits nStyle );
 
     bool                GetValue( double& rfValue ) const;
     void                SetValue( double fValue,
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 07fa080b8281..ad6034034f7b 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -30,27 +30,6 @@
 #define TP_INPUT            13
 #define TP_FORMULA          15
 
-// TP_CALC:
-#define BTN_ITERATE         1
-#define FT_STEPS            2
-#define FT_EPS              3
-#define ED_STEPS            4
-#define ED_EPS              5
-#define GB_ZREFS            6
-#define ED_PREC             7
-#define FT_PREC             8
-#define BTN_DATESTD         9
-#define BTN_DATESC10        10
-#define BTN_DATE1904        11
-#define FT_VALUE            13
-#define GB_DATE             14
-#define BTN_CASE            15
-#define BTN_CALC            17
-#define BTN_MATCH           18
-#define BTN_LOOKUP          19
-#define BTN_REGEX           20
-#define BTN_GENERAL_PREC    21
-
 // TP_VIEW:
 #define BTN_GRID            6
 
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index e566ab92ac16..645d98fb0405 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -48,34 +48,30 @@ private:
                 ~ScTpCalcOptions();
 
 private:
-    FixedLine       aGbZRefs;
-    CheckBox        aBtnIterate;
-    FixedText       aFtSteps;
-    NumericField    aEdSteps;
-    FixedText       aFtEps;
-    ScDoubleField   aEdEps;
-
-    FixedLine       aSeparatorFL;
-    FixedLine       aGbDate;
-    RadioButton     aBtnDateStd;
-    RadioButton     aBtnDateSc10;
-    RadioButton     aBtnDate1904;
-
-    CheckBox        aBtnCase;
-    CheckBox        aBtnCalc;
-    CheckBox        aBtnMatch;
-    CheckBox        aBtnRegex;
-    CheckBox        aBtnLookUp;
-    CheckBox        aBtnGeneralPrec;
-
-    FixedText       aFtPrec;
-    NumericField    aEdPrec;
+    CheckBox*       m_pBtnIterate;
+    FixedText*      m_pFtSteps;
+    NumericField*   m_pEdSteps;
+    FixedText*      m_pFtEps;
+    ScDoubleField*  m_pEdEps;
+
+    RadioButton*    m_pBtnDateStd;
+    RadioButton*    m_pBtnDateSc10;
+    RadioButton*    m_pBtnDate1904;
+
+    CheckBox*       m_pBtnCase;
+    CheckBox*       m_pBtnCalc;
+    CheckBox*       m_pBtnMatch;
+    CheckBox*       m_pBtnRegex;
+    CheckBox*       m_pBtnLookUp;
+    CheckBox*       m_pBtnGeneralPrec;
+
+    FixedText*      m_pFtPrec;
+    NumericField*   m_pEdPrec;
 
     ScDocOptions*   pOldOptions;
     ScDocOptions*   pLocalOptions;
     sal_uInt16          nWhichCalc;
 
-#ifdef _TPCALC_CXX
 private:
     void            Init();
 
@@ -83,8 +79,6 @@ private:
     // Handler:
     DECL_LINK( RadioClickHdl, RadioButton* );
     DECL_LINK( CheckClickHdl, CheckBox* );
-
-#endif
 };