summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-04 17:28:40 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-05 10:21:54 +0200
commit8cafd08278c0b925aac91ea94d8f907d98f07047 (patch)
tree1c2b0e57c895511fdc67f8063647cc520ef5eaeb /desktop
parent3363f828d63775a11073276dce927b9538b57be6 (diff)
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/app.hxx2
-rw-r--r--desktop/source/app/app.cxx3
2 files changed, 2 insertions, 3 deletions
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
<p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
respective flag in the configuration is reset.</p>
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;
}