diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-12-28 10:16:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-28 10:51:56 +0000 |
| commit | 0139ec9dac4b874854326879c776048a5c803e73 (patch) | |
| tree | ee702172e4b0c9aee4b4eb2090d9f2ad80d23f32 /svx/source/inc | |
| parent | Updated core (diff) | |
| download | core-0139ec9dac4b874854326879c776048a5c803e73.tar.gz core-0139ec9dac4b874854326879c776048a5c803e73.zip | |
convert add condition dialog to .ui
Change-Id: I0cc014909cf49d7cbfadcb5d5d8730395d558eda
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/datanavi.hrc | 7 | ||||
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 34 |
2 files changed, 13 insertions, 28 deletions
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index b80726d4baaa..23f2a1961446 100644 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc @@ -83,13 +83,6 @@ #define IID_TEXT 5 #define IID_OTHER 6 -// class AddConditionDialog -#define FT_CONDITION 10 -#define ED_CONDITION 11 -#define FT_RESULT 12 -#define FT_RESULT_PREVIEW 13 -#define PB_EDIT_NAMESPACES 14 - // class NamespaceItemDialog #define FT_NAMESPACES 10 #define LB_NAMESPACES 11 diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index b119f5b61417..11216aa1957e 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -465,15 +465,10 @@ namespace svxform class AddConditionDialog : public ModalDialog { private: - FixedText m_aConditionFT; - MultiLineEdit m_aConditionED; - FixedText m_aResultFT; - FixedText m_aResultWin; - PushButton m_aEditNamespacesBtn; - FixedLine m_aButtonsFL; - OKButton m_aOKBtn; - CancelButton m_aEscBtn; - HelpButton m_aHelpBtn; + VclMultiLineEdit* m_pConditionED; + VclMultiLineEdit* m_pResultWin; + PushButton* m_pEditNamespacesBtn; + OKButton* m_pOKBtn; Timer m_aResultTimer; OUString m_sPropertyName; @@ -487,21 +482,18 @@ namespace svxform DECL_LINK(OKHdl, void *); public: - AddConditionDialog( Window* pParent, - const OUString& _rPropertyName, const XPropertySet_ref& _rBinding ); - ~AddConditionDialog(); + AddConditionDialog(Window* pParent, + const OUString& _rPropertyName, const XPropertySet_ref& _rBinding); - inline XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } - inline OUString GetCondition() const { return m_aConditionED.GetText(); } - inline void SetCondition( const OUString& _rCondition ); + XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } + OUString GetCondition() const { return m_pConditionED->GetText(); } + void SetCondition(const OUString& _rCondition) + { + m_pConditionED->SetText(_rCondition); + m_aResultTimer.Start(); + } }; - inline void AddConditionDialog::SetCondition( const OUString& _rCondition ) - { - m_aConditionED.SetText( _rCondition ); - m_aResultTimer.Start(); - } - //======================================================================== class NamespaceItemDialog : public ModalDialog { |