mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ib169950f4e33dc71db66fd9a938838b568d2cc22
This commit is contained in:
Noel Grandin
2015-05-26 13:08:20 +02:00
parent 390aa6277a
commit 15e64391ae
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbaccess/source/ui/control/FieldDescControl.cxx
View File

@@ -208,8 +208,8 @@ void OFieldDescControl::dispose()
m_pType.clear(); m_pType.clear();
m_pAutoIncrementValue.clear(); m_pAutoIncrementValue.clear();
pFormat.clear(); pFormat.clear();
m_pVertScroll.clear(); m_pVertScroll.disposeAndClear();
m_pHorzScroll.clear(); m_pHorzScroll.disposeAndClear();
TabPage::dispose(); TabPage::dispose();
} }

6
dbaccess/source/ui/tabledesign/TEditControl.cxx
View File

@@ -85,7 +85,11 @@ OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,
OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator() OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator()
{ {
m_aInvalidateTimer.Stop(); m_aInvalidateTimer.Stop();
}
void OTableEditorCtrl::ClipboardInvalidator::Stop()
{
m_aInvalidateTimer.Stop();
} }
IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void)
@@ -260,6 +264,8 @@ void OTableEditorCtrl::dispose()
// Reset the Undo-Manager // Reset the Undo-Manager
GetUndoManager().Clear(); GetUndoManager().Clear();
m_aInvalidate.Stop();
// Take possible Events from the queue // Take possible Events from the queue
if( nCutEvent ) if( nCutEvent )
Application::RemoveUserEvent( nCutEvent ); Application::RemoveUserEvent( nCutEvent );

1
dbaccess/source/ui/tabledesign/TEditControl.hxx
View File

@@ -76,6 +76,7 @@ namespace dbaui
public: public:
ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*); ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
~ClipboardInvalidator(); ~ClipboardInvalidator();
void Stop();
protected: protected:
DECL_LINK_TYPED(OnInvalidate, Timer*, void); DECL_LINK_TYPED(OnInvalidate, Timer*, void);