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/source/dialog | |
| 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/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
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(); } |