diff options
Diffstat (limited to 'starmath/source')
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 7 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 14 | ||||
-rw-r--r-- | starmath/source/utility.cxx | 4 |
3 files changed, 9 insertions, 16 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index ae493da6c0a6..17735bf9e8c6 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -725,19 +725,18 @@ void SmElementsDockingWindow::SelectClickHandler( SmElement* pElement ) } } -IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList) +IMPL_LINK_TYPED( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void) { for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aCategories) ; i++) { sal_uInt16 aCurrentCategory = aCategories[i]; OUString aCurrentCategoryString = SM_RESSTR(aCurrentCategory); - if (aCurrentCategoryString == pList->GetSelectEntry()) + if (aCurrentCategoryString == rList.GetSelectEntry()) { mpElementsControl->setElementSetId(aCurrentCategory); - return 0; + return; } } - return 0; } SmViewShell* SmElementsDockingWindow::GetView() diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index f8cf2e04796e..9e93e1f1b73b 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1450,10 +1450,9 @@ void SmSymbolDialog::FillSymbolSets(bool bDeleteText) } -IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl ) +IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void ) { SelectSymbolSet(m_pSymbolSets->GetSelectEntry()); - return 0; } @@ -1843,21 +1842,19 @@ IMPL_LINK( SmSymDefineDialog, ModifyHdl, ComboBox *, pComboBox ) } -IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, pListBox ) +IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) { - (void) pListBox; + (void) rListBox; #if OSL_DEBUG_LEVEL > 1 - OSL_ENSURE(pListBox == pFonts, "Sm : wrong argument"); + OSL_ENSURE(&rListBox == pFonts, "Sm : wrong argument"); #endif SelectFont(pFonts->GetSelectEntry()); - return 0; } -IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, pListBox ) +IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void ) { - (void) pListBox; sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nPos) { @@ -1867,7 +1864,6 @@ IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, pListBox ) pCharsetDisplay->SelectCharacter( pSubset->GetRangeMin() ); } } - return 0; } diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 5083cbbda90f..39b04440402b 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -157,7 +157,7 @@ SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) : SetSelectHdl(LINK(this, SmFontPickListBox, SelectHdl)); } -IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ ) +IMPL_LINK_NOARG_TYPED( SmFontPickListBox, SelectHdl, ListBox&, void ) { OUString aString; @@ -172,8 +172,6 @@ IMPL_LINK( SmFontPickListBox, SelectHdl, ListBox *, /*pListBox*/ ) } SelectEntryPos(0); - - return 0; } SmFontPickListBox& SmFontPickListBox::operator=(const SmFontPickList& rList) |