diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 14:20:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:33 +0200 |
| commit | 036ee34543748633c2c9758f78a8ac746a10d97e (patch) | |
| tree | d2e6b635d09476d294c07cea5db7d6ef8e998d6a /sd/source/ui/view/FormShellManager.cxx | |
| parent | 0ddd679dda38fbfa0773b5933e05bf1b4b73601e (diff) | |
convert Link<> to typed
Change-Id: I9607eeb7ce800004bceeda25ae819cf8b5744979
Diffstat (limited to 'sd/source/ui/view/FormShellManager.cxx')
| -rw-r--r-- | sd/source/ui/view/FormShellManager.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index ad6354b96105..2712dd4bbbef 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -91,7 +91,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) // Disconnect from the old form shell. if (mpFormShell != NULL) { - mpFormShell->SetControlActivationHandler(Link<>()); + mpFormShell->SetControlActivationHandler(Link<LinkParamNone*,void>()); EndListening(*mpFormShell); mpFormShell->SetView(NULL); } @@ -183,7 +183,7 @@ void FormShellManager::UnregisterAtCenterPane() mpSubShellFactory.reset(); } -IMPL_LINK_NOARG(FormShellManager, FormControlActivated) +IMPL_LINK_NOARG_TYPED(FormShellManager, FormControlActivated, LinkParamNone*, void) { // The form shell has been activated. To give it priority in reacting to // slot calls the form shell is moved to the top of the object bar shell @@ -196,8 +196,6 @@ IMPL_LINK_NOARG(FormShellManager, FormControlActivated) ViewShellManager::UpdateLock aLock (mrBase.GetViewShellManager()); mrBase.GetViewShellManager()->SetFormShell(pShell,mpFormShell,mbFormShellAboveViewShell); } - - return 0; } IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent*, pEvent) |