#101595# clear list box in dtor when not already cleared
This commit is contained in:
parent
a9bfb486d8
commit
524d1db64a
1 changed files with 13 additions and 2 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: WColumnSelect.cxx,v $
|
||||
*
|
||||
* $Revision: 1.8 $
|
||||
* $Revision: 1.9 $
|
||||
*
|
||||
* last change: $Author: jmarmion $ $Date: 2002-07-11 13:37:24 $
|
||||
* last change: $Author: oj $ $Date: 2002-07-22 12:04:47 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -150,6 +150,15 @@ OWizColumnSelect::OWizColumnSelect( Window* pParent)
|
|||
// -----------------------------------------------------------------------
|
||||
OWizColumnSelect::~OWizColumnSelect()
|
||||
{
|
||||
while ( m_lbNewColumnNames.GetEntryCount() )
|
||||
{
|
||||
void* pData = m_lbNewColumnNames.GetEntryData(0);
|
||||
if ( pData )
|
||||
delete static_cast<OFieldDescription*>(pData);
|
||||
|
||||
m_lbNewColumnNames.RemoveEntry(0);
|
||||
}
|
||||
m_lbNewColumnNames.Clear();
|
||||
DBG_DTOR(OWizColumnSelect,NULL);
|
||||
}
|
||||
|
||||
|
@ -217,6 +226,8 @@ sal_Bool OWizColumnSelect::LeavePage()
|
|||
m_pParent->insertColumn(i,pField);
|
||||
}
|
||||
|
||||
clearListBox(m_lbNewColumnNames);
|
||||
|
||||
|
||||
if(m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_NEXT || m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_FINISH)
|
||||
return m_pParent->getDestColumns()->size();
|
||||
|
|
Loading…
Reference in a new issue