mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the config data to the sub-dialog.

Browse Source 
Change-Id: I7d5e5cd22a64446c379446372f29bf1c597bd783
This commit is contained in:
Kohei Yoshida
2012-05-29 23:33:17 -04:00
parent b52fc9ad04
commit 7dd9054bde
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sc/source/ui/optdlg/calcoptionsdlg.cxx
View File

@@ -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)), ModalDialog(pParent, ScResId(RID_SCDLG_FORMULA_CALCOPTIONS)),
maLbSettings(this, ScResId(LB_SETTINGS)), maLbSettings(this, ScResId(LB_SETTINGS)),
maFtOptionEditCaption(this, ScResId(FT_OPTION_EDIT_CAPTION)), maFtOptionEditCaption(this, ScResId(FT_OPTION_EDIT_CAPTION)),
@@ -74,7 +74,8 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent) :
maBtnOK(this, ScResId(BTN_OK)), maBtnOK(this, ScResId(BTN_OK)),
maBtnCancel(this, ScResId(BTN_CANCEL)), maBtnCancel(this, ScResId(BTN_CANCEL)),
maCaptionIndirectSyntax(ScResId(STR_INDIRECT_SYNTAX_CAPTION).toString()), 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.SetStyle(maLbSettings.GetStyle() | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE);
maLbSettings.SetHighlightRange(); maLbSettings.SetHighlightRange();

6
sc/source/ui/optdlg/calcoptionsdlg.hxx
View File

@@ -34,10 +34,12 @@
#include "vcl/fixed.hxx" #include "vcl/fixed.hxx"
#include "svx/checklbx.hxx" #include "svx/checklbx.hxx"
#include "calcconfig.hxx"
class ScCalcOptionsDialog : public ModalDialog class ScCalcOptionsDialog : public ModalDialog
{ {
public: public:
ScCalcOptionsDialog(Window* pParent); ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig);
virtual ~ScCalcOptionsDialog(); virtual ~ScCalcOptionsDialog();
DECL_LINK( SettingsSelHdl, void* ); DECL_LINK( SettingsSelHdl, void* );
@@ -62,6 +64,8 @@ private:
rtl::OUString maCaptionIndirectSyntax; rtl::OUString maCaptionIndirectSyntax;
rtl::OUString maDescIndirectSyntax; rtl::OUString maDescIndirectSyntax;
ScCalcConfig maConfig;
}; };
#endif #endif

2
sc/source/ui/optdlg/tpformula.cxx
View File

@@ -141,7 +141,7 @@ void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault)
void ScTpFormulaOptions::LaunchCustomCalcSettings() void ScTpFormulaOptions::LaunchCustomCalcSettings()
{ {
ScCalcOptionsDialog aDlg(this); ScCalcOptionsDialog aDlg(this, maCurrentConfig);
if (aDlg.Execute() == RET_OK) if (aDlg.Execute() == RET_OK)
{ {