Kaydet (Commit) 15e64391 authored tarafından Noel Grandin's avatar Noel Grandin

tdf#91543 - TABLE DESIGN window menu option Close causes BASE to crash

Change-Id: Ib169950f4e33dc71db66fd9a938838b568d2cc22
üst 390aa627
......@@ -208,8 +208,8 @@ void OFieldDescControl::dispose()
m_pType.clear();
m_pAutoIncrementValue.clear();
pFormat.clear();
m_pVertScroll.clear();
m_pHorzScroll.clear();
m_pVertScroll.disposeAndClear();
m_pHorzScroll.disposeAndClear();
TabPage::dispose();
}
......
......@@ -85,7 +85,11 @@ OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,
OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{
m_aInvalidateTimer.Stop();
}
void OTableEditorCtrl::ClipboardInvalidator::Stop()
{
m_aInvalidateTimer.Stop();
}
IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void)
......@@ -260,6 +264,8 @@ void OTableEditorCtrl::dispose()
// Reset the Undo-Manager
GetUndoManager().Clear();
m_aInvalidate.Stop();
// Take possible Events from the queue
if( nCutEvent )
Application::RemoveUserEvent( nCutEvent );
......
......@@ -76,6 +76,7 @@ namespace dbaui
public:
ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
~ClipboardInvalidator();
void Stop();
protected:
DECL_LINK_TYPED(OnInvalidate, Timer*, void);
......
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