diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-02 09:20:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 07:20:27 +0000 |
| commit | 5beffcf3f1fd96fb9909b93759f8537417048863 (patch) | |
| tree | 4c3818fa030c9b5f99a7abd3a39b68945a0c41e3 /sfx2 | |
| parent | 84945163ab6496d22ca814880cfd14ceb33c5f14 (diff) | |
convert Link<> to typed
Change-Id: Ic0482dc5ed26eb2fc6ccde73022eff8b4786de83
Reviewed-on: https://gerrit.libreoffice.org/18258
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f2106fc9d2ac..00ef0bc5b7f6 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1582,12 +1582,11 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) return pPage; } -IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl ) +IMPL_LINK_TYPED( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl, void ) { sal_uInt16 nId = 0; TabPage* pPage = GetCurrentPage( nId ); pTabCtrl->SetTabPage( nId, pPage ); - return 0; } IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl) diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 0d08861074ba..fd5e3d67404b 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -313,7 +313,7 @@ private: inline SearchTabPage_Impl* GetSearchPage(); inline BookmarksTabPage_Impl* GetBookmarksPage(); - DECL_LINK( ActivatePageHdl, TabControl* ); + DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void ); DECL_LINK(SelectHdl, void *); DECL_LINK_TYPED(InitHdl, Idle *, void); DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d19a2abfa9b0..26a97b624639 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1094,7 +1094,7 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) -IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) +IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) /* [Description] @@ -1127,7 +1127,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) if (!pDataObject) { SAL_WARN("sfx.config", "Tab Page ID not known, this is pretty serious and needs investigation"); - return 0; + return; } // Create TabPage if possible: @@ -1189,9 +1189,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) if ( pExampleSet ) pTabPage->ActivatePage( *pExampleSet ); - bool bReadOnly = pTabPage->IsReadOnly(); - ( bReadOnly || pImpl->bHideResetBtn ) ? m_pResetBtn->Hide() : m_pResetBtn->Show(); - return 0; + + if ( pTabPage->IsReadOnly() || pImpl->bHideResetBtn ) + m_pResetBtn->Hide(); + else + m_pResetBtn->Show(); } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index ae677b17cb25..94b6bd706db2 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -383,15 +383,13 @@ FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentFilter() return FILTER_APPLICATION::NONE; } -IMPL_LINK_NOARG(SfxTemplateManagerDlg,ActivatePageHdl) +IMPL_LINK_NOARG_TYPED(SfxTemplateManagerDlg, ActivatePageHdl, TabControl*, void) { mpCurView->filterItems(ViewFilter_Application(getCurrentFilter())); mpCurView->showRootRegion(); // fdo#60586 show the root region of the applied filter if (mpSearchView->IsVisible()) SearchUpdateHdl(NULL); - - return 0; } void SfxTemplateManagerDlg::readSettings () |