diff options
author | Jennifer Liebel <jliebel94@gmail.com> | 2014-11-10 14:57:14 +0000 |
---|---|---|
committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:35:06 +0000 |
commit | e4200feb14f54db6d70e9b39c0ecb73ac1a8372c (patch) | |
tree | 90333746d11dd1d49fc677f93fa1a1226fcdff7f /framework | |
parent | 9fe256e56d80a310538e55c3730a6321282b0716 (diff) |
changed timers to idle
Change-Id: I5846940cc45781f4a0264047107dbb568604d543
Diffstat (limited to 'framework')
-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 c9665323a1cc..825714c0687d 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; } |