diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 19:11:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 19:15:32 +0200 |
| commit | 5eb6bd4db7fb3d43672c386ac9cde58e981c8aa2 (patch) | |
| tree | dadf670246d763449c3bacef4acfdd2c6251d198 /desktop | |
| parent | e6fa865b4d5c7eb0576f7b1510077bca081ce4fb (diff) | |
lopluign:staticmethods: Handle DECL_LINK
Change-Id: Ib27854a8470f3ff5b208cb949a7bd02f2a86c969
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 98829878c088..5c6b708270df 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -84,7 +84,7 @@ class Desktop : public Application static void OpenClients(); static void OpenDefault(); - DECL_LINK( EnableAcceptors_Impl, void*); + DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*); static void HandleAppEvent( const ApplicationEvent& rAppEvent ); static ResMgr* GetDesktopResManager(); @@ -153,7 +153,7 @@ class Desktop : public Application void CloseSplashScreen(); static void EnableOleAutomation(); - DECL_LINK( ImplInitFilterHdl, ConvertData* ); + DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData* ); DECL_STATIC_LINK_TYPED( Desktop, 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 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 971483dab7eb..b1adc632ebdb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1714,7 +1714,7 @@ int Desktop::doShutdown() return EXIT_SUCCESS; } -IMPL_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData ) +IMPL_STATIC_LINK_NOINSTANCE( Desktop, ImplInitFilterHdl, ConvertData*, pData ) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData ); } @@ -1907,7 +1907,7 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) } // enable acceptos -IMPL_LINK_NOARG(Desktop, EnableAcceptors_Impl) +IMPL_STATIC_LINK_NOINSTANCE_NOARG(Desktop, EnableAcceptors_Impl) { enableAcceptors(); return 0; |