diff options
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 488f67b4dbac..c1630faf53b1 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -243,7 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, ToolBarManager::~ToolBarManager() { - assert(!m_aAsyncUpdateControllersTimer.IsActive()); + assert(!m_aAsyncUpdateControllersIdle.IsActive()); OSL_ASSERT( m_pToolBar == 0 ); OSL_ASSERT( !m_bAddedToTaskPaneList ); } @@ -631,7 +631,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception // stop timer to prevent timer events after dispose // do it last because other calls could restart timer in StateChanged() - m_aAsyncUpdateControllersTimer.Stop(); + m_aAsyncUpdateControllersIdle.Stop(); m_bDisposed = true; } |