diff options
author | Jennifer Liebel <jliebel94@gmail.com> | 2014-11-17 09:18:52 +0000 |
---|---|---|
committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:34:58 +0000 |
commit | d843f3de731667a298a83fc66637c7f983f3b24d (patch) | |
tree | 7858b40511f16654d93828676991d8a4b84a044a /cui | |
parent | 821ae0fb9fa63e0171f987d5ec210ec121978b8f (diff) |
changed timers to idle
Change-Id: I92f40d3dad133347f1b8db0b025b624d3305f885
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/optjava.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optjava.hxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index e9991454ac94..242ac08d9795 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -182,8 +182,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& m_pAddBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) ); m_pParameterBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ParameterHdl_Impl ) ); m_pClassPathBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ClassPathHdl_Impl ) ); - m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); - m_aResetTimer.SetTimeout( RESET_TIMEOUT ); + m_aResetIdle.SetIdleHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) ); + m_aResetIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER); m_pExpertConfigBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage, ExpertConfigHdl_Impl) ); if (!officecfg::Office::Common::Security::EnableExpertConfiguration::get()) @@ -771,7 +771,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) m_pMacroCB->Check( aMiscOpt.IsMacroRecorderMode() ); m_pMacroCB->SaveValue(); - m_aResetTimer.Start(); + m_aResetIdle.Start(); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 353b749f32f5..247d9cd19db3 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -72,7 +72,7 @@ private: OUString m_sInstallText; OUString m_sAccessibilityText; OUString m_sAddDialogText; - Timer m_aResetTimer; + Idle m_aResetIdle; CheckBox* m_pExperimentalCB; CheckBox* m_pMacroCB; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 0288663bdf8a..233b9b9a55e6 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -55,7 +55,7 @@ public: SfxConfigFunctionListBox* pMacroLB; bool bReadOnly; - Timer maFillGroupTimer; + Idle maFillGroupIdle; bool bGotEvents; bool m_bDummyActivated; ///< has this tab page already been activated }; @@ -188,11 +188,11 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet ) void _SfxMacroTabPage::LaunchFillGroup() { - if (!mpImpl->maFillGroupTimer.GetTimeoutHdl().IsSet()) + if (!mpImpl->maFillGroupIdle.GetTimeoutHdl().IsSet()) { - mpImpl->maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) ); - mpImpl->maFillGroupTimer.SetTimeout( 0 ); - mpImpl->maFillGroupTimer.Start(); + mpImpl->maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) ); + mpImpl->maFillGroupIdle.SetPriority( VCL_IDLE_PRIORITY_HIGHEST ); + mpImpl->maFillGroupIdle.Start(); } } |