diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-09 21:35:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:25:47 +0200 |
| commit | 9bb254fc85eea7615cf8b9fa3700754fbd4c971c (patch) | |
| tree | 96966587eee7453845fae3ec4c0868adbb48148c /desktop | |
| parent | 4d2a9bc3a63f682520e73f0c89c23cc87cbdef36 (diff) | |
NOINSTANCE is implied now in IMPL_STATIC_LINK...
Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b1adc632ebdb..8a86c5416ccc 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1714,7 +1714,7 @@ int Desktop::doShutdown() return EXIT_SUCCESS; } -IMPL_STATIC_LINK_NOINSTANCE( Desktop, ImplInitFilterHdl, ConvertData*, pData ) +IMPL_STATIC_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData ) { return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( pData ); } @@ -1864,7 +1864,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) } -IMPL_STATIC_LINK_NOINSTANCE_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) +IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) { DoFirstRunInitializations(); } @@ -1907,7 +1907,7 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl) } // enable acceptos -IMPL_STATIC_LINK_NOINSTANCE_NOARG(Desktop, EnableAcceptors_Impl) +IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl) { enableAcceptors(); return 0; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index d87980ffab44..cb6ad0b98c02 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -286,7 +286,7 @@ public: DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void* pEvent ); }; -IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) { // Application events are processed by the Desktop::HandleAppEvent implementation. Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) ); @@ -294,7 +294,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) +IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) { // Documents requests are processed by the OfficeIPCThread implementation ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent); |