diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-06 12:05:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 06:56:57 +0000 |
| commit | 9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch) | |
| tree | 1bab2dbd1185adf86714718f5fb1a757c1a101e9 /sw/source/ui | |
| parent | 67a5fbeb8e2d6775ff6bd7bfd35ff5027d38457c (diff) | |
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/misc/glossary.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index af3b25e6cb3e..2e0e2c465df0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1485,7 +1485,7 @@ IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) return false; } -IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) +IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu, bool) { const OUString sSaveAutoMarkURL = sAutoMarkURL; OString sIdent(pMenu->GetCurItemIdent()); @@ -1503,7 +1503,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) sAutoMarkURL = lcl_CreateAutoMarkFileDlg( sAutoMarkURL, sAutoMarkType, false); if( sAutoMarkURL.isEmpty() ) - return 0; + return false; } VclPtrInstance<SwAutoMarkDlg_Impl> pAutoMarkDlg( @@ -1512,7 +1512,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu) if( RET_OK != pAutoMarkDlg->Execute() && bNew ) sAutoMarkURL = sSaveAutoMarkURL; } - return 0; + return false; } class SwTOXEdit : public Edit diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 1b4a79b30503..0f411c2c4294 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -441,7 +441,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) return true; } -IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) +IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool ) { OString sItemIdent(pMn->GetCurItemIdent()); @@ -468,7 +468,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) ScopedVclPtrInstance<MessageDialog>::Create(this, SW_RES(STR_DOUBLE_SHORTNAME), VCL_MESSAGE_INFO)->Execute(); m_pShortNameEdit->SetSelection(Selection(0, SELECTION_MAX)); m_pShortNameEdit->GrabFocus(); - return 1; + return true; } if(pGlossaryHdl->NewGlossary(aStr, aShortName, false, bNoAttr )) { @@ -608,9 +608,9 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) } else { - return 0; + return false; } - return 1; + return true; } // dialog manage regions diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 6b71cdecde9a..3673672b40a8 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -259,7 +259,7 @@ IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); } -IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) +IMPL_LINK_TYPED( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool ) { sal_uInt8 nLevelNo = 0; OString sIdent = pMenu->GetCurItemIdent(); @@ -302,7 +302,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) *pNumRule, aName ), pDlg->GetCurEntryPos() ); pMenu->SetItemText(pMenu->GetItemId(pDlg->GetCurEntryPos()), aName); } - return 0; + return false; } if( nLevelNo-- ) @@ -321,7 +321,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) SfxTabPage* pPage = GetTabPage( nPageId ); pPage->Reset(GetOutputItemSet()); - return 0; + return false; } sal_uInt16 SwOutlineTabDialog::GetLevel(const OUString &rFormatName) const |