[Libreoffice-commits] core.git: Branch 'feature/priorities' - framework/source

[Tobias Madl]

 framework/source/uielement/toolbarmanager.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ccad3636f8577b1e89a8e3064dd51d2bd4d53751
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date:   Wed Nov 19 12:47:05 2014 +0000

    merge fix
    
    Change-Id: If567ad20c9bfbe93da8ea73a4e36b46a62280474

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index cc07a53..f18bc3f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -477,7 +477,7 @@ throw ( RuntimeException, std::exception )
     SolarMutexGuard g;
     if ( Action.Action == FrameAction_CONTEXT_CHANGED )
     {
-        m_aAsyncUpdateControllersIdle.Start();
+        m_aAsyncUpdateControllersTimer.Start();
     }
 }
 
@@ -1417,7 +1417,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
         UpdateControllers();
     else if ( m_pToolBar->IsReallyVisible() )
     {
-        m_aAsyncUpdateControllersIdle.Start();
+        m_aAsyncUpdateControllersTimer.Start();
     }
 
     // Try to retrieve UIName from the container property set and set it as the title
@@ -2046,7 +2046,7 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
     {
         if ( m_pToolBar->IsReallyVisible() )
         {
-            m_aAsyncUpdateControllersIdle.Start();
+            m_aAsyncUpdateControllersTimer.Start();
         }
     }
     else if ( *pStateChangedType == StateChangedType::INITSHOW )