diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-12 12:13:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-12 12:56:36 +0100 |
| commit | 1606171e91f854296e04e186a37d8d6da4d12c05 (patch) | |
| tree | 471e6caaaf4a9b0d6afa2809d3171d6814fade16 | |
| parent | e6a05e9f3276cccce5d72adce24a8d2fee6b8b7b (diff) | |
rearrange CustomPropertiesTypeBox
Change-Id: Ib30389f7ddf0a85d03b519b586bacf45b3c8adc7
| -rw-r--r-- | include/sfx2/dinfdlg.hxx | 7 | ||||
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 6926a21a91f0..43d36f7a02ee 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -289,12 +289,7 @@ private: CustomPropertyLine* m_pLine; public: - CustomPropertiesTypeBox(vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine) - : ListBox(pParent, rResId) - , m_pLine(pLine) - { - } - + CustomPropertiesTypeBox(vcl::Window* pParent, CustomPropertyLine* pLine); CustomPropertyLine* GetLine() const { return m_pLine; } }; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index c763f6a779fb..e2bb52924c12 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1420,10 +1420,16 @@ namespace } } +CustomPropertiesTypeBox::CustomPropertiesTypeBox(vcl::Window* pParent, CustomPropertyLine* pLine) + : ListBox(pParent, SfxResId(SFX_LB_PROPERTY_TYPE)) + , m_pLine(pLine) +{ +} + // struct CustomPropertyLine --------------------------------------------- CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aNameBox ( makeComboBox(pParent) ), - m_aTypeBox ( VclPtr<CustomPropertiesTypeBox>::Create(pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this) ), + m_aTypeBox ( VclPtr<CustomPropertiesTypeBox>::Create(pParent, this) ), m_aValueEdit ( VclPtr<CustomPropertiesEdit>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_LEFT, this ) ), m_aDateField ( VclPtr<CustomPropertiesDateField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ), m_aTimeField ( VclPtr<CustomPropertiesTimeField>::Create(pParent, WB_BORDER|WB_TABSTOP|WB_SPIN|WB_LEFT ) ), |