diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-12-28 00:33:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-28 09:51:28 +0000 |
| commit | cc866c0297de076488b8778aa036a3ed3c673678 (patch) | |
| tree | 82e5496c8c0d3438e65533a8007299263d2960fc /svx/source/inc | |
| parent | Updated core (diff) | |
| download | core-cc866c0297de076488b8778aa036a3ed3c673678.tar.gz core-cc866c0297de076488b8778aa036a3ed3c673678.zip | |
convert additem dialog to .ui
Change-Id: Id85ad8dc81089b62a82eafbcea1b04ddccdbc50d
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/datanavi.hrc | 26 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 49 |
2 files changed, 24 insertions, 51 deletions
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index 21057a68d99f..b80726d4baaa 100644 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc @@ -83,32 +83,6 @@ #define IID_TEXT 5 #define IID_OTHER 6 -// class AddDataItemDialog -#define FL_ITEM 10 -#define FT_NAME 11 -#define ED_NAME 12 -#define FT_DEFAULT 13 -#define ED_DEFAULT 14 -#define PB_DEFAULT 15 -#define FL_SETTINGS 16 -#define FT_DATATYPE 17 -#define LB_DATATYPE 18 -#define CB_REQUIRED 19 -#define PB_REQUIRED 20 -#define CB_RELEVANT 21 -#define PB_RELEVANT 22 -#define CB_CONSTRAINT 23 -#define PB_CONSTRAINT 24 -#define CB_READONLY 25 -#define PB_READONLY 26 -#define CB_CALCULATE 27 -#define PB_CALCULATE 28 - -#define STR_FIXEDLINE_ELEMENT 10 -#define STR_FIXEDLINE_ATTRIBUTE 11 -#define STR_FIXEDLINE_BINDING 12 -#define STR_FIXEDTEXT_BINDING 13 - // class AddConditionDialog #define FT_CONDITION 10 #define ED_CONDITION 11 diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 3a99b1de1b13..b119f5b61417 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -21,6 +21,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/menubtn.hxx> #include <vcl/msgbox.hxx> @@ -408,32 +409,30 @@ namespace svxform { private: - FixedLine m_aItemFL; - FixedText m_aNameFT; - Edit m_aNameED; - FixedText m_aDefaultFT; - Edit m_aDefaultED; - PushButton m_aDefaultBtn; - - FixedLine m_aSettingsFL; - FixedText m_aDataTypeFT; - ListBox m_aDataTypeLB; - - CheckBox m_aRequiredCB; - PushButton m_aRequiredBtn; - CheckBox m_aRelevantCB; - PushButton m_aRelevantBtn; - CheckBox m_aConstraintCB; - PushButton m_aConstraintBtn; - CheckBox m_aReadonlyCB; - PushButton m_aReadonlyBtn; - CheckBox m_aCalculateCB; - PushButton m_aCalculateBtn; + VclFrame* m_pItemFrame; + FixedText* m_pNameFT; + Edit* m_pNameED; + FixedText* m_pDefaultFT; + Edit* m_pDefaultED; + PushButton* m_pDefaultBtn; + + VclFrame* m_pSettingsFrame; + + FixedText* m_pDataTypeFT; + ListBox* m_pDataTypeLB; + + CheckBox* m_pRequiredCB; + PushButton* m_pRequiredBtn; + CheckBox* m_pRelevantCB; + PushButton* m_pRelevantBtn; + CheckBox* m_pConstraintCB; + PushButton* m_pConstraintBtn; + CheckBox* m_pReadonlyCB; + PushButton* m_pReadonlyBtn; + CheckBox* m_pCalculateCB; + PushButton* m_pCalculateBtn; - FixedLine m_aButtonsFL; - OKButton m_aOKBtn; - CancelButton m_aEscBtn; - HelpButton m_aHelpBtn; + OKButton* m_pOKBtn; XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; |