diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-29 23:33:17 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-30 11:37:21 -0400 |
| commit | 7dd9054bdef2ac169212a74e1eff52c8f0847e8f (patch) | |
| tree | 15e0cde48a1822fc84ad35ea7121a76db7f66d6b | |
| parent | b52fc9ad0469f5a16496b2eb5a6b77e3028814ee (diff) | |
Pass the config data to the sub-dialog.
Change-Id: I7d5e5cd22a64446c379446372f29bf1c597bd783
| -rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/tpformula.cxx | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index be6803bbc2ba..2e22da6618b5 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -64,7 +64,7 @@ void OptionString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, } -ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent) : +ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig) : ModalDialog(pParent, ScResId(RID_SCDLG_FORMULA_CALCOPTIONS)), maLbSettings(this, ScResId(LB_SETTINGS)), maFtOptionEditCaption(this, ScResId(FT_OPTION_EDIT_CAPTION)), @@ -74,7 +74,8 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent) : maBtnOK(this, ScResId(BTN_OK)), maBtnCancel(this, ScResId(BTN_CANCEL)), maCaptionIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_CAPTION).toString()), - maDescIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_DESC).toString()) + maDescIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_DESC).toString()), + maConfig(rConfig) { maLbSettings.SetStyle(maLbSettings.GetStyle() | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); maLbSettings.SetHighlightRange(); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index a812d92a19c7..b7263c80249b 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -34,10 +34,12 @@ #include "vcl/fixed.hxx" #include "svx/checklbx.hxx" +#include "calcconfig.hxx" + class ScCalcOptionsDialog : public ModalDialog { public: - ScCalcOptionsDialog(Window* pParent); + ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig); virtual ~ScCalcOptionsDialog(); DECL_LINK( SettingsSelHdl, void* ); @@ -62,6 +64,8 @@ private: rtl::OUString maCaptionIndirectSyntax; rtl::OUString maDescIndirectSyntax; + + ScCalcConfig maConfig; }; #endif diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index eb882158fe94..06327051bae2 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -141,7 +141,7 @@ void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault) void ScTpFormulaOptions::LaunchCustomCalcSettings() { - ScCalcOptionsDialog aDlg(this); + ScCalcOptionsDialog aDlg(this, maCurrentConfig); if (aDlg.Execute() == RET_OK) { |