diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-06 10:29:11 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 19:57:33 +0100 |
| commit | a632fa5f2e059642f0feffb200e8c9a71ee75802 (patch) | |
| tree | ab1c9cc0dee047fd2fa2d050ebeb12c6ab8bb6a9 /extensions | |
| parent | 10981bc4e349f59818d8f750db378e1ae579ba09 (diff) | |
vcl: rename VclReference to VclPtr
and remove the typedefs. The code is more obvious this way.
Change-Id: I4c8f5b5ab050dd96216302a03e760ed0e3ab3464
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 0592b06a5955..9bab3502e305 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1029,7 +1029,7 @@ namespace pcr { SetCompoundControl( true ); - m_pImplEdit = MultiLineEditRef( new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) ) ); + m_pImplEdit = VclPtr<MultiLineEdit>( new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) ) ); SetSubEdit( m_pImplEdit.get() ); m_pImplEdit->Show(); @@ -1064,7 +1064,7 @@ namespace pcr boost::scoped_ptr<vcl::Window> aTemp(m_pFloatingEdit); m_pFloatingEdit = NULL; } - SetSubEdit(EditRef()); + SetSubEdit(VclPtr<Edit>()); { boost::scoped_ptr<vcl::Window> aTemp(m_pDropdownButton); m_pDropdownButton = NULL; diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 8b125633ee2d..17865f84888a 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -375,7 +375,7 @@ namespace pcr { private: OMultilineFloatingEdit* m_pFloatingEdit; - VclReference<MultiLineEdit> m_pImplEdit; + VclPtr<MultiLineEdit> m_pImplEdit; PushButton* m_pDropdownButton; MultiLineOperationMode m_nOperationMode; bool m_bDropdown : 1; |