Kaydet (Commit) 2b1772c5 authored tarafından Michael Meeks's avatar Michael Meeks

add missing disposeAndClear pieces for VclMEdit

Also correct dispose ordering in dbaccess.
üst 6d0c8912
......@@ -252,13 +252,14 @@ void OAppDetailPageHelper::dispose()
m_pLists[i].disposeAndClear();
}
}
m_aFL.disposeAndClear();
m_aTBPreview.disposeAndClear();
m_aPreview.disposeAndClear();
m_aDocumentInfo.disposeAndClear();
m_aMenu.reset();
m_pTablePreview.disposeAndClear();
m_aDocumentInfo.disposeAndClear();
m_aPreview.disposeAndClear();
m_aBorder.disposeAndClear();
m_aMenu.reset();
m_aTBPreview.disposeAndClear();
m_aFL.disposeAndClear();
vcl::Window::dispose();
}
......
......@@ -1489,7 +1489,8 @@ SfxViewFrame::~SfxViewFrame()
// The Bindings delete the Frame!
KillDispatcher_Impl();
pImp->pWindow.clear();
pImp->pWindow.disposeAndClear();
pImp->pFocusWin.clear();
if ( GetFrame().GetCurrentViewFrame() == this )
GetFrame().SetCurrentViewFrame_Impl( NULL );
......
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment