From 8cafd08278c0b925aac91ea94d8f907d98f07047 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 4 May 2015 17:28:40 +0200 Subject: Use typed Timer::SetTimeoutHdl Link Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100 --- desktop/inc/app.hxx | 2 +- desktop/source/app/app.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'desktop') diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index d5d184d2e02d..21ab2f0b0916 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -154,7 +154,7 @@ class Desktop : public Application static void EnableOleAutomation(); DECL_LINK( ImplInitFilterHdl, ConvertData* ); - DECL_LINK( AsyncInitFirstRun, void* ); + DECL_LINK_TYPED( AsyncInitFirstRun, Timer*, void ); /** checks if the office is run the first time

If so, DoFirstRunInitializations is called (asynchronously and delayed) and the respective flag in the configuration is reset.

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 389389294551..5be7223be8ab 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1864,10 +1864,9 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) } -IMPL_LINK_NOARG(Desktop, AsyncInitFirstRun) +IMPL_LINK_NOARG_TYPED(Desktop, AsyncInitFirstRun, Timer *, void) { DoFirstRunInitializations(); - return 0L; } -- cgit