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 /sd/source | |
| parent | 4d2a9bc3a63f682520e73f0c89c23cc87cbdef36 (diff) | |
NOINSTANCE is implied now in IMPL_STATIC_LINK...
Change-Id: Ifb032457d6c1b279c4183282ef2b271c706dd71a
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ba881e88d41e..6ed8eb39dbf4 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -513,7 +513,7 @@ IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG(AnnotationWindow, ModifyHdl) +IMPL_STATIC_LINK_NOARG(AnnotationWindow, ModifyHdl) { return 0; } diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index adb22b15ac53..79d10ba494c4 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -416,7 +416,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) } } -IMPL_STATIC_LINK_NOINSTANCE( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) +IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent*, pEvent ) { if( pEvent && (pEvent->GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(pEvent)->GetData() ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 61dfb38f8a7d..1fe443c1eea2 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -266,7 +266,7 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool) +IMPL_STATIC_LINK_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool) { return true; } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 1f891e580ea1..f00a422d9ae7 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -313,7 +313,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void) } } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( +IMPL_STATIC_LINK_NOARG_TYPED( SdNavigatorWin, ClickToolboxHdl, ToolBox *, void) {} diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 94eb6800ebfd..cae6b2724504 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -137,7 +137,7 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } -IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) +IMPL_STATIC_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release our reference to the instance. |