summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-05 07:56:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-05 07:56:12 +0200
commit106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch)
treee55ab4706654d10a5f9b75acfdecec72fda804c3 /starmath/source
parent36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff)
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually typed Link" to distinguish the new, typed versions from the old, untyped ones, but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173 "remove untyped Link<>" removed the old versions. Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/ElementsDockingWindow.cxx6
-rw-r--r--starmath/source/accessibility.cxx2
-rw-r--r--starmath/source/accessibility.hxx2
-rw-r--r--starmath/source/dialog.cxx58
-rw-r--r--starmath/source/edit.cxx10
-rw-r--r--starmath/source/utility.cxx2
-rw-r--r--starmath/source/view.cxx6
7 files changed, 43 insertions, 43 deletions
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index adba7e19fbcb..1f4ef1f39c08 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -486,7 +486,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent)
}
}
-IMPL_LINK_NOARG_TYPED( SmElementsControl, ScrollHdl, ScrollBar*, void )
+IMPL_LINK_NOARG( SmElementsControl, ScrollHdl, ScrollBar*, void )
{
DoScroll(mxScroll->GetDelta());
}
@@ -760,7 +760,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle& rReactangle, bool bFl
mpElementsControl->setVerticalMode(bVertical);
}
-IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void)
+IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void)
{
SmViewShell* pViewSh = GetView();
@@ -772,7 +772,7 @@ IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElemen
}
}
-IMPL_LINK_TYPED( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
+IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
{
for (sal_uInt16 aCurrentCategory : aCategories)
{
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index fc3a9444b85a..5883f3c594df 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -937,7 +937,7 @@ SmTextForwarder::~SmTextForwarder()
pEditEngine->SetNotifyHdl( Link<EENotify&,void>() );
}
-IMPL_LINK_TYPED(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void)
+IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void)
{
::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify );
if (aHint.get())
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index de257aa004cb..657838fd0767 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -181,7 +181,7 @@ class SmTextForwarder : /* analog to SvxEditEngineForwarder */
SmEditAccessible & rEditAcc;
SmEditSource & rEditSource;
- DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
+ DECL_LINK( NotifyHdl, EENotify&, void );
SmTextForwarder( const SmTextForwarder & ) = delete;
SmTextForwarder & operator = ( const SmTextForwarder & ) = delete;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4b999962aff7..73bc61fb074f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -159,7 +159,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL);
}
-IMPL_LINK_NOARG_TYPED( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
{
m_pZoom->Enable(m_pSizeZoomed->IsChecked());
}
@@ -299,13 +299,13 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
Invalidate();
}
-IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
{
maFont.SetFamilyName(rComboBox.GetText());
m_pShowFont->SetFont(maFont);
}
-IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
+IMPL_LINK( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
{
ComboBox& rComboBox = static_cast<ComboBox&>(rEdit);
// if font is available in list then use it
@@ -316,7 +316,7 @@ IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
}
}
-IMPL_LINK_NOARG_TYPED( SmFontDialog, AttrChangeHdl, Button*, void )
+IMPL_LINK_NOARG( SmFontDialog, AttrChangeHdl, Button*, void )
{
if (m_pBoldCheckBox->IsChecked())
maFont.SetWeight(FontWeight(WEIGHT_BOLD));
@@ -421,7 +421,7 @@ public:
}
};
-IMPL_LINK_NOARG_TYPED( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void )
{
if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
{
@@ -495,7 +495,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
rFormat.RequestApplyChanges();
}
-IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
SmFontPickListBox *pActiveListBox;
@@ -523,7 +523,7 @@ IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
return false;
}
-IMPL_LINK_NOARG_TYPED( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void )
{
if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
{
@@ -692,7 +692,7 @@ SmCategoryDesc::~SmCategoryDesc()
/**************************************************************************/
-IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
+IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
{
if (Categories[nActiveCategory])
{
@@ -712,14 +712,14 @@ IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
}
}
-IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
SetCategory(pMenu->GetCurItemId() - 1);
return false;
}
-IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
{
if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
{
@@ -730,7 +730,7 @@ IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
}
}
-IMPL_LINK_TYPED( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void )
+IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void )
{
if (pCheckBox == m_pCheckBox1)
{
@@ -1018,7 +1018,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
rFormat.RequestApplyChanges();
}
-IMPL_LINK_NOARG_TYPED( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
{
if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
{
@@ -1351,7 +1351,7 @@ void SmShowSymbolSetWindow::Resize()
calccols();
}
-IMPL_LINK_TYPED( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void)
+IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void)
{
Invalidate();
}
@@ -1445,18 +1445,18 @@ void SmSymbolDialog::FillSymbolSets()
}
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void )
{
SelectSymbolSet(m_pSymbolSets->GetSelectEntry());
}
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void )
{
SelectSymbol(m_pSymbolSetDisplay->GetSelectSymbol());
}
-IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
+IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, Button*, void)
{
ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr);
@@ -1497,11 +1497,11 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
}
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
{
SymbolDblClickHdl();
}
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void )
{
SymbolDblClickHdl();
}
@@ -1512,7 +1512,7 @@ void SmSymbolDialog::SymbolDblClickHdl()
}
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, GetClickHdl, Button*, void )
+IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void )
{
const SmSym *pSym = GetSymbol();
if (pSym)
@@ -1773,7 +1773,7 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
}
-IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void )
{
(void) rComboBox;
assert(&rComboBox == pOldSymbols && "Sm : wrong argument");
@@ -1781,7 +1781,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, vo
}
-IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void )
{
(void) rComboBox;
assert(&rComboBox == pOldSymbolSets && "Sm : wrong argument");
@@ -1789,7 +1789,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox,
}
-IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
+IMPL_LINK( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
{
ComboBox& rComboBox = static_cast<ComboBox&>(rEdit);
// remember cursor position for later restoring of it
@@ -1816,7 +1816,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
UpdateButtons();
}
-IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
+IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
{
(void) rListBox;
assert(&rListBox == pFonts && "Sm : wrong argument");
@@ -1825,7 +1825,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
}
-IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
{
sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos();
if (LISTBOX_ENTRY_NOTFOUND != nPos)
@@ -1839,7 +1839,7 @@ IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
}
-IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
{
(void) rComboBox;
assert(&rComboBox == pStyles && "Sm : falsches Argument");
@@ -1848,7 +1848,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
}
-IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void)
+IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void)
{
sal_UCS4 cChar = pCharsetDisplay->GetSelectCharacter();
@@ -1876,7 +1876,7 @@ IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void
}
-IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
{
(void) pButton;
assert(pButton == pAddBtn && "Sm : wrong argument");
@@ -1903,7 +1903,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
}
-IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
{
(void) pButton;
assert(pButton == pChangeBtn && "Sm : wrong argument");
@@ -1940,7 +1940,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
}
-IMPL_LINK_TYPED( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void )
{
(void) pButton;
assert(pButton == pDeleteBtn && "Sm : wrong argument");
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 3cf5b1681407..109ad5ed819a 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -251,13 +251,13 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
Resize();
}
-IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void )
+IMPL_LINK_NOARG( SmEditWindow, ModifyTimerHdl, Idle *, void )
{
UpdateStatus(false);
aModifyIdle.Stop();
}
-IMPL_LINK_NOARG_TYPED(SmEditWindow, CursorMoveTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SmEditWindow, CursorMoveTimerHdl, Idle *, void)
// every once in a while check cursor position (selection) of edit
// window and if it has changed (try to) set the formula-cursor
// according to that.
@@ -403,7 +403,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
}
-IMPL_LINK_TYPED( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
{
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
@@ -579,13 +579,13 @@ void SmEditWindow::CreateEditView()
}
-IMPL_LINK_NOARG_TYPED( SmEditWindow, EditStatusHdl, EditStatus&, void )
+IMPL_LINK_NOARG( SmEditWindow, EditStatusHdl, EditStatus&, void )
{
if (pEditView)
Resize();
}
-IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
{
OSL_ENSURE(pEditView, "EditView missing");
if (pEditView)
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 6072c8fa213f..34a4de5b0015 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -130,7 +130,7 @@ SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) :
SetSelectHdl(LINK(this, SmFontPickListBox, SelectHdl));
}
-IMPL_LINK_NOARG_TYPED( SmFontPickListBox, SelectHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmFontPickListBox, SelectHdl, ListBox&, void )
{
OUString aString;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 03d8d403adaf..a2f7fa8b2814 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -257,7 +257,7 @@ void SmGraphicWindow::RepaintViewShellDoc()
pDoc->Repaint();
}
-IMPL_LINK_NOARG_TYPED(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void)
+IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void)
{
if (IsCursorVisible())
SetIsCursorVisible(false);
@@ -780,7 +780,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
SfxDockingWindow::StateChanged( nStateChange );
}
-IMPL_LINK_NOARG_TYPED( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void )
+IMPL_LINK_NOARG( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void )
{
// We want to have the focus in the edit window once Math has been opened
// to allow for immediate typing.
@@ -2009,7 +2009,7 @@ void SmViewShell::Activate( bool bIsMDIActivate )
}
}
-IMPL_LINK_TYPED( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void )
+IMPL_LINK( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void )
{
assert(_pFileDlg && "SmViewShell::DialogClosedHdl(): no file dialog");
assert(pImpl->pDocInserter && "ScDocShell::DialogClosedHdl(): no document inserter");