summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJennifer Liebel <jliebel94@gmail.com>2014-11-10 14:57:14 +0000
committerTobias Madl <tobias.madl.dev@gmail.com>2014-12-09 12:35:03 +0000
commit9f3e3923d799022381b9fad9d9155c7d65745ae3 (patch)
treef42d68ef1b1baae3492102e814e0bf58b5dd679d /framework
parentd1684e16b52f9e94facfb674a8e65246bbbdb987 (diff)
changed timers to idle
Change-Id: I5846940cc45781f4a0264047107dbb568604d543
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/toolbarmanager.cxx4
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;
}