diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-17 15:37:03 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 11:41:51 +0100 |
| commit | 2b1772c5b8bd4aedbc7ec7a9a916ac8c8f975f34 (patch) | |
| tree | 01b2dbc4098bb3d4b30d77dd544f6c8063b68bc4 /vcl | |
| parent | 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9 (diff) | |
add missing disposeAndClear pieces for VclMEdit
Also correct dispose ordering in dbaccess.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/edit/vclmedit.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index f11e40495751..4322248fad75 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -255,6 +255,11 @@ void ImpVclMEdit::InitFromStyle( WinBits nWinStyle ) ImpVclMEdit::~ImpVclMEdit() { EndListening( *mpTextWindow->GetTextEngine() ); + mpScrollBox.disposeAndClear(); + mpVScrollBar.disposeAndClear(); + mpHScrollBar.disposeAndClear(); + mpTextWindow.disposeAndClear(); + pVclMultiLineEdit.disposeAndClear(); } void ImpVclMEdit::ImpSetScrollBarRanges() @@ -1153,17 +1158,17 @@ void VclMultiLineEdit::SetText( const OUString& rStr ) OUString VclMultiLineEdit::GetText() const { - return pImpVclMEdit->GetText(); + return pImpVclMEdit ? pImpVclMEdit->GetText() : OUString(""); } OUString VclMultiLineEdit::GetText( LineEnd aSeparator ) const { - return pImpVclMEdit->GetText( aSeparator ); + return pImpVclMEdit ? pImpVclMEdit->GetText( aSeparator ) : OUString(""); } -OUString VclMultiLineEdit::GetTextLines( LineEnd aSeparator ) const +OUString VclMultiLineEdit::GetTextLines( LineEnd aSeparator ) const { - return pImpVclMEdit->GetTextLines( aSeparator ); + return pImpVclMEdit ? pImpVclMEdit->GetTextLines( aSeparator ) : OUString(""); } void VclMultiLineEdit::Resize() |