diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-07 22:12:40 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-28 13:28:27 -0500 |
| commit | 19d0fcd04ee36e66d64b0f3e3faf751f0c6cdc63 (patch) | |
| tree | ba744a3b0038db2b28b97808811ee7baddd29a4f | |
| parent | e801413b55ea756cfebf313ecfb23181cdeed0e1 (diff) | |
Added OK button next to the Cancel button.
Change-Id: I05782d9be74b3fddd34b79f3e15b43800b654d87
| -rw-r--r-- | sc/source/ui/inc/xmlsourcedlg.hrc | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/xmlsourcedlg.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/src/xmlsourcedlg.src | 6 | ||||
| -rw-r--r-- | sc/source/ui/xmlsource/xmlsourcedlg.cxx | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/inc/xmlsourcedlg.hrc b/sc/source/ui/inc/xmlsourcedlg.hrc index a5df4033f281..748bed5f0d7c 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hrc +++ b/sc/source/ui/inc/xmlsourcedlg.hrc @@ -9,8 +9,8 @@ #include "sc.hrc" -#define BTN_OK 0 -#define BTN_CANCEL 1 +#define BTN_OK 1 +#define BTN_CANCEL 2 #define FL_SOURCE_FILE 10 #define BTN_SELECT_SOURCE_FILE 11 diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 052f96e69790..b75f32331882 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -43,6 +43,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg formula::RefEdit maRefEdit; formula::RefButton maRefBtn; + OKButton maBtnOk; CancelButton maBtnCancel; Image maImgFileOpen; diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src index ef6a8f4073a6..99d6f5655c40 100644 --- a/sc/source/ui/src/xmlsourcedlg.src +++ b/sc/source/ui/src/xmlsourcedlg.src @@ -104,6 +104,12 @@ ModelessDialog RID_SCDLG_XML_SOURCE MaskColor = STD_MASKCOLOR ; }; + OKButton BTN_OK + { + Pos = MAP_APPFONT ( 139 , 181 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + CancelButton BTN_CANCEL { Pos = MAP_APPFONT ( 194 , 181 ) ; diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index eae0f99b9f4c..69fb08d2efc8 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -40,6 +40,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( maRefEdit(this, this, ScResId(ED_MAPPED_CELL)), maRefBtn(this, ScResId(BTN_MAPPED_CELL), &maRefEdit, this), maLbTree(this, ScResId(LB_SOURCE_TREE)), + maBtnOk(this, ScResId(BTN_OK)), maBtnCancel(this, ScResId(BTN_CANCEL)), maImgFileOpen(ScResId(IMG_FILE_OPEN)), mpDoc(pDoc), |