diff options
| author | Jennifer Liebel <jliebel94@gmail.com> | 2014-11-06 11:52:02 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:34:51 +0000 |
| commit | 18102201f4a68bc41f7caa21fc22ec761812b70b (patch) | |
| tree | 92eeebc502ba9a332c3d3c020c1ace17aa7c0b02 /framework/inc | |
| parent | 93f5b9be9f4c01ac0d863a193f4ef33dfd194af0 (diff) | |
changed some timer to idle
Change-Id: If137dbd80f7260d9507e48709d3f0f14b60a25f6
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 0dcfc4574404..12e9d30df44e 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -309,8 +309,8 @@ namespace framework css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowStateSupplier; GlobalSettings* m_pGlobalSettings; - OUString m_aModuleIdentifier; - Timer m_aAsyncLayoutTimer; + OUString m_aModuleIdentifier; + Idle m_aAsyncLayoutIdle; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener ToolbarLayoutManager* m_pToolbarManager; css::uno::Reference< ::com::sun::star::ui::XUIConfigurationListener > m_xToolbarManager; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 462f48ee8eb2..320aa7c7e1bc 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -208,7 +208,7 @@ class ToolBarManager : public ToolbarManager_Base CommandToInfoMap m_aCommandMap; SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; - Timer m_aAsyncUpdateControllersTimer; + Idle m_aAsyncUpdateControllersIdle; OUString m_sIconTheme; MenuDescriptionMap m_aMenuMap; bool m_bAcceleratorCfg; |