dbaccess/source/ui/control/FieldDescControl.cxx | 4 ++-- dbaccess/source/ui/tabledesign/TEditControl.cxx | 6 ++++++ dbaccess/source/ui/tabledesign/TEditControl.hxx | 1 + 3 files changed, 9 insertions(+), 2 deletions(-)
New commits: commit 15e64391aeed35e5c85876650fd8093f20958d8b Author: Noel Grandin <[email protected]> Date: Tue May 26 13:08:20 2015 +0200 tdf#91543 - TABLE DESIGN window menu option Close causes BASE to crash Change-Id: Ib169950f4e33dc71db66fd9a938838b568d2cc22 diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index ca610b1..d89e81a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -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(); } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index eb0c16f..ba64896 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -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 ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index bbd4d18..b56e8d8 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -76,6 +76,7 @@ namespace dbaui public: ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*); ~ClipboardInvalidator(); + void Stop(); protected: DECL_LINK_TYPED(OnInvalidate, Timer*, void); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
