diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 14:22:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-23 13:10:23 +0000 |
| commit | 5ae90e154aa2544174f7522a5464436901152cc7 (patch) | |
| tree | b802fd8a69bd0f7785081d7f1c5772d53fe077a2 /sc/source/ui/pagedlg | |
| parent | c24ce843619416f1e6c082a6e8e512310e6e0040 (diff) | |
convert Link<> to typed
Change-Id: Ib0f043cf40f2a1b4b9f0837a5c536994bff3aeef
Reviewed-on: https://gerrit.libreoffice.org/18810
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/ui/pagedlg')
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 38 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 2 |
2 files changed, 18 insertions, 22 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index b4df75a6a126..2f1cb0daafe6 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -823,33 +823,29 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) pActiveEdWnd->GrabFocus(); } -IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) +IMPL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) { pActiveEdWnd = ::GetScEditWindow(); if ( !pActiveEdWnd ) - return 0; + return; - if(pBtn!=NULL) - { - SAL_WARN_IF(pBtn->GetSelected() == 0, "sc.ui", "nothing selected"); - OString sSelectedId = pBtn->GetSelectedIdent(); + SAL_WARN_IF(rBtn.GetSelected() == 0, "sc.ui", "nothing selected"); + OString sSelectedId = rBtn.GetSelectedIdent(); - if (sSelectedId == "title") - { - pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD ) ); - } - else if (sSelectedId == "filename") - { - pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField( - OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), EE_FEATURE_FIELD ) ); - } - else if (sSelectedId == "pathname") - { - pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField( - OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) ); - } + if (sSelectedId == "title") + { + pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField(), EE_FEATURE_FIELD ) ); + } + else if (sSelectedId == "filename") + { + pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField( + OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ), EE_FEATURE_FIELD ) ); + } + else if (sSelectedId == "pathname") + { + pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField( + OUString(), SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ), EE_FEATURE_FIELD ) ); } - return 0; } // class ScRightHeaderEditPage diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 0452e9c470dd..a152453b8fbc 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -395,7 +395,7 @@ void ScExtIButton::StartPopup() if(nSelected) { aSelectedIdent = pPopupMenu->GetItemIdent(nSelected); - aMLink.Call(this); + aMLink.Call(*this); } SetPressed( false); |