diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /cui | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (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 'cui')
180 files changed, 1315 insertions, 1315 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 95ad22de82d3..65281aadce3d 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1059,18 +1059,18 @@ void SfxAcceleratorConfigPage::ResetConfig() m_pEntriesBox->Clear(); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Load, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load, Button*, void) { // ask for filename, where we should load the new config data from StartFileDialog( 0, aLoadAccelConfigStr ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Save, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save, Button*, void) { StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default, Button*, void) { uno::Reference<form::XReset> xReset(m_xAct, uno::UNO_QUERY); if (xReset.is()) @@ -1084,7 +1084,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void) m_pEntriesBox->Select(m_pEntriesBox->GetEntry(nullptr, 0)); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) { sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(nullptr, nPos)->GetUserData()); @@ -1100,7 +1100,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) { // get selected entry sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); @@ -1114,7 +1114,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } -IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void ) +IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void ) { // disable help Help::ShowBalloon( this, Point(), Rectangle(), OUString() ); @@ -1200,7 +1200,7 @@ IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, } } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, Button*, void) { uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct; @@ -1233,7 +1233,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); @@ -1317,7 +1317,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper* } -IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 715c29f9a3cc..bfda9e3f3551 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2108,7 +2108,7 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* ) return result; } -IMPL_LINK_NOARG_TYPED( SvxConfigPage, SelectSaveInLocation, ListBox&, void ) +IMPL_LINK_NOARG( SvxConfigPage, SelectSaveInLocation, ListBox&, void ) { pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( m_pSaveInListBox->GetSelectEntryPos())); @@ -2344,7 +2344,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( return pNewEntry; } -IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void ) +IMPL_LINK_NOARG( SvxConfigPage, AsyncInfoMsg, void*, void ) { // Asynchronous msg because of D&D ScopedVclPtrInstance<MessageDialog>(this, @@ -2352,7 +2352,7 @@ IMPL_LINK_NOARG_TYPED( SvxConfigPage, AsyncInfoMsg, void*, void ) VclMessageType::Info)->Execute(); } -IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); } @@ -2516,7 +2516,7 @@ void SvxMenuConfigPage::dispose() SvxConfigPage::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void ) { UpdateButtonStates(); } @@ -2633,7 +2633,7 @@ short SvxMenuConfigPage::QueryReset() return qbox->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenu, ListBox&, void ) { m_pContentsListBox->Clear(); @@ -2663,7 +2663,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) UpdateButtonStates(); } -IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) { OString sIdent = pButton->GetCurItemIdent(); @@ -2710,7 +2710,7 @@ IMPL_LINK_TYPED( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton, void ) } } -IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) { OString sIdent = pButton->GetCurItemIdent(); if (sIdent == "addsubmenu") @@ -2769,12 +2769,12 @@ IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) { AddFunction(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, NewMenuHdl, Button *, void ) { VclPtrInstance<SvxMainMenuOrganizerDialog> pDialog( nullptr, GetSaveInData()->GetEntries(), nullptr, true ); @@ -2787,7 +2787,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) { if ( m_pSelectorDlg == nullptr ) { @@ -2809,7 +2809,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) m_pSelectorDlg->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) { SvxConfigEntry* pNewEntryData = new SvxConfigEntry; pNewEntryData->SetUserDefined(); @@ -2821,7 +2821,7 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddSeparatorHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, DeleteCommandHdl, Button *, void ) +IMPL_LINK_NOARG( SvxMenuConfigPage, DeleteCommandHdl, Button *, void ) { DeleteSelectedContent(); if ( GetSaveInData()->IsModified() ) @@ -2938,7 +2938,7 @@ void SvxMainMenuOrganizerDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) { // if the Edit control is empty do not change the name if (m_pMenuNameEdit->GetText().isEmpty()) @@ -2954,7 +2954,7 @@ IMPL_LINK_NOARG_TYPED(SvxMainMenuOrganizerDialog, ModifyHdl, Edit&, void) m_pMenuListBox->SetEntryText( pNewMenuEntry, pNewEntryData->GetName() ); } -IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) +IMPL_LINK_NOARG( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) { UpdateButtonStates(); } @@ -2970,7 +2970,7 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates() m_pMoveDownButton->Enable( selection != last ); } -IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void ) { SvTreeListEntry *pSourceEntry = m_pMenuListBox->FirstSelected(); SvTreeListEntry *pTargetEntry = nullptr; @@ -3305,7 +3305,7 @@ void SvxToolbarConfigPage::DeleteSelectedContent() } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); } @@ -3325,7 +3325,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp ) } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -3370,7 +3370,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, } } -IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, void ) { bool bNeedsApply = false; @@ -4453,7 +4453,7 @@ void ToolbarSaveInData::LoadToolbar( } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void ) { UpdateButtonStates(); } @@ -4514,7 +4514,7 @@ short SvxToolbarConfigPage::QueryReset() return qbox->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) { m_pContentsListBox->Clear(); @@ -4594,7 +4594,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) UpdateButtonStates(); } -IMPL_LINK_TYPED( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) +IMPL_LINK( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -4626,7 +4626,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR ); @@ -4684,7 +4684,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) { if ( m_pSelectorDlg == nullptr ) { @@ -4704,7 +4704,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) m_pSelectorDlg->Execute(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) { // get currently selected toolbar SvxConfigEntry* pToolbar = GetTopLevelSelection(); @@ -4722,12 +4722,12 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddSeparatorHdl, Button *, void ) UpdateButtonStates(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, DeleteCommandHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, DeleteCommandHdl, Button *, void ) { DeleteSelectedContent(); } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) { sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); @@ -4748,7 +4748,7 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, ResetTopLevelHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) +IMPL_LINK_NOARG( SvxToolbarConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void ) { AddFunction(); } @@ -5231,7 +5231,7 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon() return result; } -IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) +IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) { (void)pToolBox; @@ -5261,7 +5261,7 @@ IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) } } -IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void) +IMPL_LINK_NOARG( SvxIconSelectorDialog, ImportHdl, Button *, void) { sfx2::FileDialogHelper aImportDialog( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, @@ -5287,7 +5287,7 @@ IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void) } } -IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void ) +IMPL_LINK_NOARG( SvxIconSelectorDialog, DeleteHdl, Button *, void ) { OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ); if (ScopedVclPtrInstance<WarningBox>(this, WinBits(WB_OK_CANCEL), message)->Execute() == RET_OK) diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 8ba080dba886..082194fdc66d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -167,7 +167,7 @@ void SvxEventConfigPage::ImplInitDocument() } } -IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void ) { bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData( m_pSaveInListBox->GetSelectEntryPos())); diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 749bf11b8175..764972a0c8a0 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -37,7 +37,7 @@ class SvxEventConfigPage : public SvxMacroTabPage_ bool bAppConfig; - DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); + DECL_LINK( SelectHdl_Impl, ListBox&, void ); SvxEventConfigPage (const SvxEventConfigPage &) = delete; SvxEventConfigPage & operator= (const SvxEventConfigPage &) = delete; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 718d59e9be81..3826bf53713f 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -83,7 +83,7 @@ static long nTabs[] = #define LB_MACROS_ITEMPOS 2 -IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar == maHeaderBar.get(), "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." ); (void)pBar; @@ -567,7 +567,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) } // select event handler on the listbox -IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -583,12 +583,12 @@ IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_TYPED( SvxMacroTabPage_, AssignDeleteHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxMacroTabPage_, AssignDeleteHdl_Impl, Button*, pBtn, void ) { GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) ); } -IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, DoubleClickHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG( SvxMacroTabPage_, DoubleClickHdl_Impl, SvTreeListBox*, bool) { return GenericHandler_Impl( this, nullptr ); } @@ -850,7 +850,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra } -IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void) +IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, Button*, void) { OUString aMethodName = mpMethodEdit->GetText(); maURL.clear(); @@ -890,7 +890,7 @@ void AssignComponentDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void ) { GetTabPage()->FillItemSet( nullptr ); EndDialog( RET_OK ); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index f460ca216ca1..b3d9d3842bf0 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -45,7 +45,7 @@ private: OUString maURL; - DECL_LINK_TYPED(ButtonHandler, Button*, void); + DECL_LINK(ButtonHandler, Button*, void); public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 06894bac5c5f..d595d2e1f5ff 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -138,7 +138,7 @@ void SvxConfigFunctionListBox::MouseMove( const MouseEvent& rMEvt ) } -IMPL_LINK_NOARG_TYPED(SvxConfigFunctionListBox, TimerHdl, Timer *, void) +IMPL_LINK_NOARG(SvxConfigFunctionListBox, TimerHdl, Timer *, void) { aTimer.Stop(); Point aMousePos = GetPointerPosPixel(); @@ -967,7 +967,7 @@ void SvxScriptSelectorDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void ) +IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void ) { if (pCtrl == m_pCategories) { @@ -980,7 +980,7 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void UpdateUI(); } -IMPL_LINK_NOARG_TYPED( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool ) { if (m_pOKButton->IsEnabled()) ClickHdl(m_pOKButton); @@ -1008,7 +1008,7 @@ SvxScriptSelectorDialog::UpdateUI() } } -IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) +IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) { if (pButton == m_pCancelButton) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index af15bb5878ba..56bbd308123f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -438,7 +438,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent /* Initialize, asynchronous to prevent virtual calls from a constructor */ -IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) +IMPL_LINK_NOARG( SpellDialog, InitHdl, void*, void) { m_pToolbar->Disable(); SetUpdateMode( false ); @@ -469,7 +469,7 @@ IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) }; -IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) +IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void ) { if (m_pOptionsPB == pBtn) StartSpellOptDlg_Impl(); @@ -501,7 +501,7 @@ IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SpellDialog, CheckGrammarHdl, Button*, pBox, void ) +IMPL_LINK( SpellDialog, CheckGrammarHdl, Button*, pBox, void ) { rParent.SetGrammarChecking( static_cast<CheckBox*>(pBox)->IsChecked() ); Impl_Restore(true); @@ -565,12 +565,12 @@ OUString SpellDialog::getReplacementString() const } -IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl, ListBox&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, ChangeHdl, Button*, void) { if(m_pSentenceED->IsUndoEditMode()) { @@ -590,7 +590,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl, Button*, void) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); OUString aString = getReplacementString(); @@ -620,7 +620,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) } -IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) +IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); // add word to IgnoreAll list @@ -667,7 +667,7 @@ IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) } -IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, UndoHdl, Button*, void) { m_pSentenceED->Undo(); if(!m_pSentenceED->GetUndoActionCount()) @@ -675,7 +675,7 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) } -IMPL_LINK_TYPED( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl&, rAction, void ) +IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl&, rAction, void ) { switch(rAction.GetId()) { @@ -732,7 +732,7 @@ void SpellDialog::Impl_Restore(bool bUseSavedSentence) m_pIgnorePB->SetText(m_sIgnoreOnceST); } -IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, IgnoreHdl, Button*, void) { if (m_sResumeST.equals(m_pIgnorePB->GetText())) { @@ -776,7 +776,7 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const } -IMPL_LINK_TYPED(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) +IMPL_LINK(SpellDialog, LanguageSelectHdl, ListBox&, rBox, void) { //If selected language changes, then add->list should be regenerated to //match @@ -886,13 +886,13 @@ int SpellDialog::InitUserDicts() } -IMPL_LINK_NOARG_TYPED(SpellDialog, AddToDictClickHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, AddToDictClickHdl, Button*, void) { AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu()); } -IMPL_LINK_TYPED(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton, void ) +IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton, void ) { AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu()); } @@ -946,7 +946,7 @@ void SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu ) } -IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void) +IMPL_LINK(SpellDialog, ModifyHdl, Edit&, rEd, void) { if (m_pSentenceED == &rEd) { @@ -971,7 +971,7 @@ IMPL_LINK_TYPED(SpellDialog, ModifyHdl, Edit&, rEd, void) }; -IMPL_LINK_NOARG_TYPED(SpellDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(SpellDialog, CancelHdl, Button*, void) { //apply changes and ignored text parts first - if there are any rParent.ApplyChangedSentence(m_pSentenceED->CreateSpellPortions(), false); @@ -1550,7 +1550,7 @@ void SentenceEditWindow_Impl::Init(VclPtr<ToolBox> &rToolbar) m_xToolbar->SetSelectHdl(LINK(this,SentenceEditWindow_Impl,ToolbarHdl)); } -IMPL_LINK_NOARG_TYPED(SentenceEditWindow_Impl, ToolbarHdl, ToolBox *, void) +IMPL_LINK_NOARG(SentenceEditWindow_Impl, ToolbarHdl, ToolBox *, void) { const sal_uInt16 nCurItemId = m_xToolbar->GetCurItemId(); if (nCurItemId == m_xToolbar->GetItemId("paste")) @@ -2053,7 +2053,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) pSpellDialog->m_pChangePB->Enable(); } -IMPL_LINK_TYPED( SpellDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) +IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void ) { OUString sURL=rHyperlink.GetURL(); OUString sTitle=GetText(); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 6826c515eafe..336951b3a7f3 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -109,7 +109,7 @@ void AboutDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED( AboutDialog, HandleClick, Button*, pButton, void ) +IMPL_LINK( AboutDialog, HandleClick, Button*, pButton, void ) { OUString sURL = ""; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 05111e1d240f..c1c7ac64e61b 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -882,10 +882,10 @@ public: void update_color(UpdateFlags n = UpdateFlags::All); - DECL_LINK_TYPED(ColorFieldControlModifydl, ColorFieldControl&, void); - DECL_LINK_TYPED(ColorSliderControlModifyHdl, ColorSliderControl&, void); - DECL_LINK_TYPED(ColorModifyEditHdl, Edit&, void); - DECL_LINK_TYPED(ModeModifyHdl, RadioButton&, void); + DECL_LINK(ColorFieldControlModifydl, ColorFieldControl&, void); + DECL_LINK(ColorSliderControlModifyHdl, ColorSliderControl&, void); + DECL_LINK(ColorModifyEditHdl, Edit&, void); + DECL_LINK(ModeModifyHdl, RadioButton&, void); sal_Int32 GetColor() const; @@ -1173,7 +1173,7 @@ void ColorPickerDialog::update_color( UpdateFlags n ) mpColorPreview->SetColor(aColor); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldControl&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldControl&, void) { double x = mpColorField->GetX(); double y = mpColorField->GetY(); @@ -1209,7 +1209,7 @@ IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorFieldControlModifydl, ColorFieldCo update_color(UpdateFlags::All & ~(UpdateFlags::ColorChooser)); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSliderControl&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSliderControl&, void) { double dValue = mpColorSlider->GetValue(); switch (meMode) @@ -1237,7 +1237,7 @@ IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ColorSliderControlModifyHdl, ColorSlide update_color(UpdateFlags::All & ~(UpdateFlags::ColorSlider)); } -IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) +IMPL_LINK(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) { UpdateFlags n = UpdateFlags::NONE; @@ -1316,7 +1316,7 @@ IMPL_LINK_TYPED(ColorPickerDialog, ColorModifyEditHdl, Edit&, rEdit, void) update_color(n); } -IMPL_LINK_NOARG_TYPED(ColorPickerDialog, ModeModifyHdl, RadioButton&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, RadioButton&, void) { ColorMode eMode = HUE; diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 7d59ee9f4570..5ac0bf270535 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -392,7 +392,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxCharacterMap, OKHdl, Button*, void) { OUString aStr = m_pShowText->GetText(); @@ -419,7 +419,7 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos )); @@ -471,7 +471,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos)); @@ -484,7 +484,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) { if (bOne) { @@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) { if ( !bOne ) { @@ -526,7 +526,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) { OUString aText; OUString aHexText; @@ -593,17 +593,17 @@ void SvxCharacterMap::selectCharByCode(Radix radix) SetChar(cChar); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, DecimalCodeChangeHdl, Edit&, void) +IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, Edit&, void) { selectCharByCode(Radix::decimal); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, HexCodeChangeHdl, Edit&, void) +IMPL_LINK_NOARG(SvxCharacterMap, HexCodeChangeHdl, Edit&, void) { selectCharByCode(Radix::hexadecimal); } -IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) +IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void) { // adjust subset selection if( pSubsetMap ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 5d77b83efd1e..a31aed0e8976 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -289,7 +289,7 @@ bool FmSearchDialog::Close() return ModalDialog::Close(); } -IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) +IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) { if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull)) { @@ -309,7 +309,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void) +IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain, Button*, void) { if (m_pbClose->IsEnabled()) { // the button has the function 'search' @@ -352,7 +352,7 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void) } } -IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void ) +IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void ) { if (m_ppbApproxSettings == pButton) { @@ -394,7 +394,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void) +IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified, Edit&, void) { if ((!m_pcmbSearchText->GetText().isEmpty()) || !m_prbSearchForText->IsChecked()) m_pbSearchAgain->Enable(); @@ -404,19 +404,19 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnSearchTextModified, Edit&, void) m_pSearchEngine->InvalidatePreviousLoc(); } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void) +IMPL_LINK_NOARG(FmSearchDialog, OnFocusGrabbed, Control&, void) { m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); } -IMPL_LINK_TYPED(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unerwartet : nicht genau ein Eintrag selektiert !"); m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos()); } -IMPL_LINK_TYPED(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !"); @@ -428,7 +428,7 @@ IMPL_LINK_TYPED(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) m_arrContextFields[nCurrentContext] = m_plbField->GetSelectEntry(); } -IMPL_LINK_TYPED(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) +IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) { bool bChecked = rBox.IsChecked(); @@ -553,7 +553,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) m_pftRecord->SetText(OUString::number(fmscContext.xCursor->getRow())); } -IMPL_LINK_TYPED( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) +IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) { InitContext(rBox.GetSelectEntryPos()); } @@ -670,7 +670,7 @@ void FmSearchDialog::EnableControlPaint(bool bEnable) } } -IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer *, void) +IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint, Timer *, void) { EnableControlPaint(true); } @@ -693,7 +693,7 @@ void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPo m_pcmbSearchText->GrabFocus(); } -IMPL_LINK_TYPED(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, void) +IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, void) { SolarMutexGuard aGuard; // make this single method thread-safe (it's an overkill to block the whole application for this, diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f12d42b7c456..2484a03dddd8 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -225,13 +225,13 @@ void SearchProgress::Terminate() } -IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn, Button*, void) { Terminate(); } -IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void) +IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void) { if (maSearchThread.is()) maSearchThread->join(); @@ -354,13 +354,13 @@ void TakeProgress::Terminate() } -IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn, Button*, void) { Terminate(); } -IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void) +IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void) { if (maTakeThread.is()) maTakeThread->join(); @@ -472,14 +472,14 @@ short ActualizeProgress::Execute() } -IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void) +IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn, Button*, void) { pTheme->AbortActualize(); EndDialog( RET_OK ); } -IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) +IMPL_LINK( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) { if ( _pTimer ) { @@ -492,7 +492,7 @@ IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) } -IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void ) +IMPL_LINK( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void ) { for( long i = 0; i < 128; i++ ) Application::Reschedule(); @@ -558,7 +558,7 @@ void GalleryIdDialog::dispose() } -IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void) +IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, Button*, void) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); @@ -972,7 +972,7 @@ void TPGalleryThemeProperties::FillFilterList() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void) { OUString aText( m_pCbbFileType->GetText() ); @@ -1001,7 +1001,7 @@ void TPGalleryThemeProperties::SearchFiles() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl, Button*, void) { if( bInputAllowed ) { @@ -1053,7 +1053,7 @@ void TPGalleryThemeProperties::TakeFiles() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) { if ( bInputAllowed ) { @@ -1100,7 +1100,7 @@ void TPGalleryThemeProperties::DoPreview() } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) { if( bInputAllowed ) { @@ -1124,7 +1124,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) { if( bInputAllowed ) { @@ -1135,7 +1135,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) { if( bInputAllowed ) { @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) { if( bInputAllowed ) { @@ -1177,14 +1177,14 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) { aPreviewTimer.Stop(); DoPreview(); } -IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void) { if( !aFoundList.empty() ) { @@ -1203,7 +1203,7 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, v } -IMPL_LINK_TYPED( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void ) +IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void ) { DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" ); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 76f4698ce5c6..dc680de5bd48 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -170,7 +170,7 @@ void GraphicFilterDialog::dispose() } -IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) { maTimer.Stop(); mpPreview->SetPreview(GetFilteredGraphic(mpPreview->GetScaledOriginal(), @@ -178,7 +178,7 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) } -IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) { if (bIsBitmap) { @@ -212,13 +212,13 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r } -IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void) +IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void) { GetModifyHdl().Call(nullptr); } -IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterMosaic, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -288,7 +288,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r } -IMPL_LINK_NOARG_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSmooth, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -351,13 +351,13 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi } -IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void) +IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void) { GetModifyHdl().Call(nullptr); } -IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSolarize, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -421,7 +421,7 @@ GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGr mpMtrSepia->SetModifyHdl( LINK(this, GraphicFilterSepia, EditModifyHdl) ); } -IMPL_LINK_NOARG_TYPED(GraphicFilterSepia, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterSepia, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } @@ -476,7 +476,7 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG } -IMPL_LINK_NOARG_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicFilterPoster, EditModifyHdl, Edit&, void) { GetModifyHdl().Call(nullptr); } diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 262cde9cc42d..ad18fcbcdd00 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -263,7 +263,7 @@ void SvxHpLinkDlg::Move() } /// Click on OK button -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) { Apply(); Close(); @@ -275,7 +275,7 @@ IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) { Apply(); } @@ -286,7 +286,7 @@ IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) { Close(); } diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index 6772f445f3ea..88b768ad974e 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -58,7 +58,7 @@ void SvxNameDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxNameDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) pBtnOK->Enable(aCheckNameHdl.Call(*this)); @@ -98,7 +98,7 @@ void SvxObjectNameDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxObjectNameDialog, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl, Edit&, void) { if(aCheckNameHdl.IsSet()) { @@ -188,14 +188,14 @@ void SvxMessDialog::dispose() /*************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button1Hdl, Button*, void) +IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl, Button*, void) { EndDialog( RET_BTN_1 ); } /*************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button2Hdl, Button*, void) +IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl, Button*, void) { EndDialog( RET_BTN_2 ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 8a1d65859002..2f6c5279eb7d 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -473,11 +473,11 @@ namespace svx } } - IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, pControl, void ) + IMPL_LINK( SuggestionDisplay, SelectSuggestionValueSetHdl, ValueSet*, pControl, void ) { SelectSuggestionHdl(pControl); } - IMPL_LINK_TYPED( SuggestionDisplay, SelectSuggestionListBoxHdl, ListBox&, rControl, void ) + IMPL_LINK( SuggestionDisplay, SelectSuggestionListBoxHdl, ListBox&, rControl, void ) { SelectSuggestionHdl(&rControl); } @@ -709,14 +709,14 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) { m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() ); OnSuggestionModified( *m_pWordInput ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionModified, Edit&, void ) { m_pFind->Enable( m_pWordInput->IsValueChangedFromSaved() ); @@ -726,7 +726,7 @@ namespace svx } - IMPL_LINK_TYPED( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void ) + IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void ) { m_aClickByCharacterLink.Call( static_cast<CheckBox*>(pBox) ); @@ -735,7 +735,7 @@ namespace svx } - IMPL_LINK_TYPED( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void ) + IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void ) { CheckBox *pOtherBox = nullptr; if ( pBox == m_pHangulOnly ) @@ -751,7 +751,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnOption, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnOption, Button*, void ) { ScopedVclPtrInstance< HangulHanjaOptionsDialog > aOptDlg(this); aOptDlg->Execute(); @@ -960,7 +960,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, OkHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl, Button*, void) { sal_uInt32 nCnt = m_aDictList.size(); sal_uInt32 n = 0; @@ -1013,7 +1013,7 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void) { bool bSel = m_pDictsLB->FirstSelected() != nullptr; @@ -1021,7 +1021,7 @@ namespace svx m_pDeletePB->Enable(bSel); } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) { OUString aName; ScopedVclPtrInstance< HangulHanjaNewDictDialog > aNewDlg(this); @@ -1052,7 +1052,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, EditDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl, Button*, void) { SvTreeListEntry* pEntry = m_pDictsLB->FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); @@ -1063,7 +1063,7 @@ namespace svx } } - IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) { sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos(); if( nSelPos != TREELIST_ENTRY_NOTFOUND ) @@ -1178,7 +1178,7 @@ namespace svx pEntry->SetUserData( new OUString( _rName ) ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl, Button*, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); @@ -1189,7 +1189,7 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl, Edit&, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); @@ -1485,12 +1485,12 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, ScrollHdl, ScrollBar*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, ScrollHdl, ScrollBar*, void ) { UpdateScrollbar(); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, OriginalModifyHdl, Edit&, void ) { m_bModifiedOriginal = true; m_aOriginal = comphelper::string::stripEnd( m_aOriginalLB->GetText(), ' ' ); @@ -1499,32 +1499,32 @@ namespace svx UpdateButtonStates(); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl1, Edit&, rEdit, void ) { EditModify( &rEdit, 0 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl2, Edit&, rEdit, void ) { EditModify( &rEdit, 1 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl3, Edit&, rEdit, void ) { EditModify( &rEdit, 2 ); } - IMPL_LINK_TYPED( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void ) + IMPL_LINK( HangulHanjaEditDictDialog, EditModifyHdl4, Edit&, rEdit, void ) { EditModify( &rEdit, 3 ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) { InitEditDictDialog( m_aBookLB->GetSelectEntryPos() ); } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1592,7 +1592,7 @@ namespace svx return bRemovedSomething; } - IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void ) + IMPL_LINK_NOARG( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void ) { if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) ) { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index d7d56760d304..c5133396258f 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -400,7 +400,7 @@ void SvxHyperlinkNewDocTp::DoApply () |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) { uno::Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 680d1dc29697..304408d8d88b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -193,7 +193,7 @@ void SvxHyperlinkDocTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) { // Open Fileopen-Dialog sfx2::FileDialogHelper aDlg( @@ -232,7 +232,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) { if ( GetPathType ( maStrURL ) == Type_ExistsFile || maStrURL.isEmpty() || @@ -262,7 +262,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -278,7 +278,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) { if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile || maStrURL.isEmpty() || @@ -301,7 +301,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) { maStrURL = GetCurrentURL(); @@ -317,7 +317,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, LostFocusPathHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl, Control&, void) { maStrURL = GetCurrentURL(); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 2508f123c812..71cc15c57c38 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -216,7 +216,7 @@ void SvxHyperlinkInternetTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbTarget->GetText() ); if( !aScheme.isEmpty() ) @@ -233,7 +233,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl, Edit&, voi |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) { RefreshMarkWindow(); } @@ -244,7 +244,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl, Edit&, void) { OUString aStrLogin ( m_pEdLogin->GetText() ); if ( aStrLogin.equalsIgnoreAsciiCase( sAnonymous ) ) @@ -331,7 +331,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void) { OUString aScheme = GetSchemeFromButtons(); SetScheme(aScheme); @@ -343,7 +343,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void) { // disable login-editfields if checked if ( m_pCbAnonymous->IsChecked() ) @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, v |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, void) { RefreshMarkWindow(); } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 1d8387ba855e..73dd0b7e8719 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -228,7 +228,7 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const OUString& aProperScheme) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) { OUString aScheme = GetSchemeFromURL( m_pCbbReceiver->GetText() ); if(!aScheme.isEmpty()) @@ -241,7 +241,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl, Edit&, void) |* |************************************************************************/ -IMPL_STATIC_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 96e2a04c52a0..986e608a6598 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -561,13 +561,13 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool) { ClickApplyHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); @@ -588,7 +588,7 @@ IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) |* |************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); if ( pEntry ) diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7e117bb43743..226e7a6a6c62 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -317,7 +317,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const } // Click on imagebutton : Script -IMPL_LINK_NOARG_TYPED(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) { SvxHyperlinkItem *pHyperlinkItem = const_cast<SvxHyperlinkItem*>(static_cast<const SvxHyperlinkItem *>( GetItemSet().GetItem (SID_HYPERLINK_GETLINK))); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 8dd3aface50f..a31c070ab83d 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -339,7 +339,7 @@ void SvxHyphenWordDialog::SelRight() } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -350,7 +350,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void ) { if( !m_bBusy ) { @@ -375,7 +375,7 @@ IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -386,7 +386,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -397,7 +397,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -408,7 +408,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl, Button*, void) { if( !m_bBusy ) { @@ -419,7 +419,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl, Button*, void) { if( !m_bBusy ) { @@ -430,7 +430,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, GetFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl, Control&, void) { m_pWordEdit->SetSelection( Selection( m_nOldPos, m_nOldPos + 1 ) ); } diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index d104557001f4..4026fdc3a869 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -334,7 +334,7 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) | select a page | \**********************************************************************/ -IMPL_LINK_NOARG_TYPED(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void) +IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, void) { SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry(); if ( !pEntry ) @@ -354,7 +354,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog , ChosePageHdl_Impl, SvtIconChoiceCtrl*, | \**********************************************************************/ -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, OkHdl, Button*, void) { bInOK = true; @@ -366,7 +366,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl, Button*, void) { bInOK = true; @@ -377,7 +377,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl, Button*, void) { ResetPageImpl (); @@ -388,7 +388,7 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void) +IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl, Button*, void) { Close(); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 9c0b5a596274..2d72164caa68 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -99,12 +99,12 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) +IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) { EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) +IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, Button*, void) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -132,7 +132,7 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) +IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl, Button*, void) { if ( m_pRbNewObject->IsChecked() ) { @@ -600,7 +600,7 @@ short SfxInsertFloatingFrameDialog::Execute() } -IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) +IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); if ( pCB == m_pCBMarginWidthDefault ) @@ -621,7 +621,7 @@ IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void } -IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) +IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { // create the file dialog sfx2::FileDialogHelper aFileDlg( diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 48e09601fdf1..4ee16b38bf1c 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -165,7 +165,7 @@ void SvBaseLinksDlg::dispose() /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ -IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void ) +IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void ) { const sal_uLong nSelectionCount = pSvTabListBox ? pSvTabListBox->GetSelectionCount() : 0; @@ -250,13 +250,13 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool ) +IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool ) { ChangeSourceClickHdl( nullptr ); return false; } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) { sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); @@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS ); } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, ManualClickHdl, Button*, void ) { sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); @@ -274,7 +274,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void ) SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL ); } -IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) +IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) { SvTabListBox& rListBox = *m_pTbLinks; @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) { sal_uLong nSelectionCount = m_pTbLinks->GetSelectionCount(); if(nSelectionCount > 1) @@ -414,7 +414,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) { bool bModified = false; if(m_pTbLinks->GetSelectionCount() <= 1) @@ -501,7 +501,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) +IMPL_LINK_NOARG( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) { m_pTbLinks->SetUpdateMode(false); for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; ) @@ -519,7 +519,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) m_pTbLinks->SetUpdateMode(true); } -IMPL_LINK_TYPED( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void ) +IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink&, _rLink, void ) { sal_uLong nPos; GetSelEntry( &nPos ); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index f3e799fc1166..afe5584e8b15 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) { sal_uLong nCount = m_pRadioLB->GetEntryCount(); bool bIsSelected = m_pRadioLB->FirstSelected() != nullptr; @@ -48,7 +48,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) m_pDelBtn->Enable(bEnable && bIsSelected); } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) { sal_uLong nCount = m_pPathLB->GetEntryCount(); bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; @@ -56,7 +56,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) m_pDelBtn->Enable(bEnable && bIsSelected); } -IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = pBox @@ -66,7 +66,7 @@ IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) m_pRadioLB->HandleEntryChecked( pEntry ); } -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -99,7 +99,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -128,7 +128,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = m_pRadioLB->FirstSelected(); delete static_cast<OUString*>(pEntry->GetUserData()); @@ -154,7 +154,7 @@ IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) SelectHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathLB->GetSelectEntryPos(); m_pPathLB->RemoveEntry( nPos ); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index f869cd3f2fe6..21b88d5e4c78 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -49,7 +49,7 @@ struct PasswordToOpenModifyDialog_Impl bool m_bIsPasswordToModify; - DECL_LINK_TYPED( OkBtnClickHdl, Button*, void ); + DECL_LINK( OkBtnClickHdl, Button*, void ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); @@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_pOptionsExpander->Hide(); } -IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) +IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) { bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() && m_pPasswdToOpenED->GetText().isEmpty() && diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 9b91856de302..d6750ca7fad0 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -73,13 +73,13 @@ void SvPasteObjectDialog::SelectObject() } } -IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, SelectHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvPasteObjectDialog, SelectHdl, ListBox&, void ) { if ( !m_pOKButton->IsEnabled() ) m_pOKButton->Enable(); } -IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void ) { EndDialog( RET_OK ); } diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 35c3500a96fd..612e38221c68 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -166,17 +166,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl, Button*, void) { aPrevHdlLink.Call( *this ); } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, NextHdl, Button*, void) { aNextHdlLink.Call( *this ); } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, Stamp, Button*, void) { Date aDate( Date::SYSTEM ); tools::Time aTime( tools::Time::SYSTEM ); @@ -199,7 +199,7 @@ IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxPostItDialog, OKHdl, Button*, void) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); pOutSet = new SfxItemSet( rSet ); diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index f8f693e7a70f..357e9b1da7a4 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -70,10 +70,10 @@ public: private: // Handler for click on save - DECL_LINK_TYPED(saveButtonHandler, Button*, void); + DECL_LINK(saveButtonHandler, Button*, void); // Handler for clicks on picture frame - DECL_LINK_TYPED(pictureFrameListener, VclWindowEvent&, void); + DECL_LINK(pictureFrameListener, VclWindowEvent&, void); // helper methods void CollectChildren( @@ -241,7 +241,7 @@ ScreenshotAnnotationDlg_Impl::~ScreenshotAnnotationDlg_Impl() mpVirtualBufferDevice.disposeAndClear(); } -IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, pButton, void) +IMPL_LINK(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, pButton, void) { (void)pButton; @@ -482,7 +482,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintPictureElement() } } -IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, rEvent, void) { // event in picture frame bool bRepaint(false); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 554a9dc0103c..8f7b433521d6 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -613,7 +613,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) } } -IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) { if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) { @@ -637,7 +637,7 @@ IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, voi } } -IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) +IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) { if ( pButton == m_pCloseButton ) { @@ -1456,7 +1456,7 @@ short SvxScriptErrorDialog::Execute() return 0; } -IMPL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, p, void ) +IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void ) { OUString* pMessage = static_cast<OUString*>(p); OUString message; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 8f320ade4bc2..0f2917fab7f5 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -51,7 +51,7 @@ void FmShowColsDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(FmShowColsDialog, OnClickedOk, Button*, void) +IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void) { DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !"); if (m_xColumns.is()) diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 7335f21a04de..3fdf3e578327 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -73,7 +73,7 @@ SvxSplitTableDlg::~SvxSplitTableDlg() m_pDialog.disposeAndClear(); } -IMPL_LINK_TYPED( SvxSplitTableDlg, ClickHdl, Button *, pButton, void ) +IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton, void ) { const bool bIsVert = pButton == m_pVertBox ; long nMax = bIsVert ? mnMaxVertical : mnMaxHorizontal; diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 5a12ed5e89e7..d6e0578ad0cc 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -193,7 +193,7 @@ void SvxSearchAttributeDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxSearchAttributeDialog, OKHdl, Button*, void) +IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl, Button*, void) { SearchAttrItem aInvalidItem; aInvalidItem.pItem = reinterpret_cast<SfxPoolItem*>(-1); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 511ff0c70dc4..cd71d22f9b29 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -92,7 +92,7 @@ void LookUpComboBox::Modify() m_aModifyIdle.Start(); } -IMPL_LINK_NOARG_TYPED( LookUpComboBox, ModifyTimer_Hdl, Idle *, void ) +IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Idle *, void ) { m_pDialog->LookUp( GetText() ); m_aModifyIdle.Stop(); @@ -336,7 +336,7 @@ void SvxThesaurusDialog::LookUp( const OUString &rText ) LookUp_Impl(); } -IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) { if (pBtn && aLookUpHistory.size() >= 2) { @@ -347,7 +347,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) } } -IMPL_LINK_TYPED( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void ) +IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void ) { OUString aLangText( rLB.GetSelectEntry() ); LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText ); @@ -377,7 +377,7 @@ void SvxThesaurusDialog::LookUp_Impl() m_pLeftBtn->Enable( aLookUpHistory.size() > 1 ); } -IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) +IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) { if (!m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { @@ -389,7 +389,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) } } -IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr; if (pEntry) @@ -405,7 +405,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox * } } -IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool ) +IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : nullptr; if (pEntry) @@ -429,7 +429,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeList return false; } -IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) +IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) { SvxCheckListBox* pBox = static_cast<SvxCheckListBox*>(p); if (pBox && pBox->GetEntryCount() >= 2) @@ -534,7 +534,7 @@ void SvxThesaurusDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void ) +IMPL_LINK_NOARG( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void ) { EndDialog(RET_OK); } diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index d79ed31a73b0..a93d18ff01f8 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -308,7 +308,7 @@ void SvxZoomDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) +IMPL_LINK(SvxZoomDialog, UserHdl, Button *, pButton, void) { mbModified = true; @@ -323,7 +323,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) } } -IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void) +IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl, Edit&, void) { if (!m_pUserBtn->IsChecked()) return; @@ -331,7 +331,7 @@ IMPL_LINK_NOARG_TYPED(SvxZoomDialog, SpinHdl, Edit&, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) { mbModified = true; @@ -358,7 +358,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) } } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) { if (&rEdit == m_pColumnsEdit && !m_pColumnsBtn->IsChecked()) return; @@ -376,7 +376,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutSpinHdl, Edit&, rEdit, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) +IMPL_LINK(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) { if (pCheckBox == m_pBookModeChk && !m_pColumnsBtn->IsChecked()) return; @@ -384,7 +384,7 @@ IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) mbModified = true; } -IMPL_LINK_TYPED(SvxZoomDialog, OKHdl, Button*, pButton, void) +IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton, void) { if (mbModified || m_pOKBtn != pButton) { diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index f748ab491e69..47f4f4c7e59c 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -160,7 +160,7 @@ long VclAbstractDialog2_Impl::GetResult() return m_pDlg->GetResult(); } -IMPL_LINK_TYPED( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) +IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) { if ( &rDlg != m_pDlg ) { @@ -590,7 +590,7 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr ) { pDlg->SetText( rStr ); } -IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) +IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) { return aCheckNameHdl.Call(*this); } @@ -614,7 +614,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<AbstractSvxObj } } -IMPL_LINK_NOARG_TYPED(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool) +IMPL_LINK_NOARG(AbstractSvxObjectNameDialog_Impl, CheckNameHdl, SvxObjectNameDialog&, bool) { return aCheckNameHdl.Call(*this); } @@ -771,11 +771,11 @@ void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<AbstractSvxPostItDialo else pDlg->SetPrevHdl( Link<SvxPostItDialog&,void>() ); } -IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl, SvxPostItDialog&, void) { aNextHdl.Call(*this); } -IMPL_LINK_NOARG_TYPED(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) +IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl, SvxPostItDialog&, void) { aPrevHdl.Call(*this); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index a753130753a0..510d18e49836 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -85,7 +85,7 @@ public: virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; virtual long GetResult() override; private: - DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); + DECL_LINK( EndDialogHdl, Dialog&, void ); }; class CuiVclAbstractDialog_Impl : public VclAbstractDialog @@ -309,7 +309,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog virtual void SetText( const OUString& rStr ) override ; private: Link<AbstractSvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool); + DECL_LINK(CheckNameHdl, SvxNameDialog&, bool); }; class SvxObjectNameDialog; @@ -323,7 +323,7 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog private: Link<AbstractSvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(CheckNameHdl, SvxObjectNameDialog&, bool); + DECL_LINK(CheckNameHdl, SvxObjectNameDialog&, bool); }; class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDialog @@ -430,8 +430,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog private: Link<AbstractSvxPostItDialog&,void> aNextHdl; Link<AbstractSvxPostItDialog&,void> aPrevHdl; - DECL_LINK_TYPED(NextHdl, SvxPostItDialog&, void); - DECL_LINK_TYPED(PrevHdl, SvxPostItDialog&, void); + DECL_LINK(NextHdl, SvxPostItDialog&, void); + DECL_LINK(PrevHdl, SvxPostItDialog&, void); }; class PasswordToOpenModifyDialog; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 60b81dbbe899..affdf32f1c85 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -74,7 +74,7 @@ private: inline SpellDialog* GetSpellDialog() const; - DECL_LINK_TYPED(ToolbarHdl, ToolBox*, void); + DECL_LINK(ToolbarHdl, ToolBox*, void); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -179,23 +179,23 @@ private: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell; - DECL_LINK_TYPED(ChangeHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickChangeHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeAllHdl, Button*, void); - DECL_LINK_TYPED( IgnoreAllHdl, Button*, void ); - DECL_LINK_TYPED(IgnoreHdl, Button*, void); - DECL_LINK_TYPED( CheckGrammarHdl, Button*, void ); - DECL_LINK_TYPED( ExtClickHdl, Button*, void ); - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void); - DECL_LINK_TYPED(UndoHdl, Button*, void); - DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); - DECL_LINK_TYPED( LanguageSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void ); - DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); - - DECL_LINK_TYPED( InitHdl, void*, void ); + DECL_LINK(ChangeHdl, Button*, void); + DECL_LINK(DoubleClickChangeHdl, ListBox&, void); + DECL_LINK(ChangeAllHdl, Button*, void); + DECL_LINK( IgnoreAllHdl, Button*, void ); + DECL_LINK(IgnoreHdl, Button*, void); + DECL_LINK( CheckGrammarHdl, Button*, void ); + DECL_LINK( ExtClickHdl, Button*, void ); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void); + DECL_LINK(UndoHdl, Button*, void); + DECL_LINK( AddToDictSelectHdl, MenuButton*, void ); + DECL_LINK( AddToDictClickHdl, Button*, void ); + DECL_LINK( LanguageSelectHdl, ListBox&, void ); + DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl&, void ); + DECL_LINK( HandleHyperlink, FixedHyperlink&, void ); + + DECL_LINK( InitHdl, void*, void ); void AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu ); void StartSpellOptDlg_Impl(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index d9597bd474f9..80fda68b6552 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -69,7 +69,7 @@ public: virtual ~AboutDialog() override; virtual void dispose() override; - DECL_LINK_TYPED( HandleClick, Button*, void ); + DECL_LINK( HandleClick, Button*, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index e7f0298c27cd..24b92c90c15a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -147,16 +147,16 @@ private: OUString m_sModuleShortName; OUString m_sModuleUIName; - DECL_LINK_TYPED(ChangeHdl, Button *, void); - DECL_LINK_TYPED(RemoveHdl, Button *, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(Save, Button *, void); - DECL_LINK_TYPED(Load, Button *, void); - DECL_LINK_TYPED(Default, Button *, void); - DECL_LINK_TYPED(RadioHdl, Button *, void); - - DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void); - DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(ChangeHdl, Button *, void); + DECL_LINK(RemoveHdl, Button *, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void ); + DECL_LINK(Save, Button *, void); + DECL_LINK(Load, Button *, void); + DECL_LINK(Default, Button *, void); + DECL_LINK(RadioHdl, Button *, void); + + DECL_LINK(LoadHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(SaveHdl, sfx2::FileDialogHelper *, void); OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3695dadf6526..c70e95cf544d 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -76,8 +76,8 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; - DECL_LINK_TYPED( UpdateEnableHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void ); + DECL_LINK( UpdateEnableHdl, ListBox&, void ); + DECL_LINK( UpdateEnableClickHdl, Button*, void ); private: VclPtr<ListBox> m_pLbHorAlign; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5005acf32a2c..5c832436e976 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -49,7 +49,7 @@ class OfaAutoCorrDlg : public SfxTabDialog sal_uInt16 m_nReplacePageId; sal_uInt16 m_nExceptionsPageId; - DECL_LINK_TYPED(SelectLanguageHdl, ListBox&, void); + DECL_LINK(SelectLanguageHdl, ListBox&, void); public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); @@ -160,9 +160,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickEditHdl, SvTreeListBox*, bool); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(DoubleClickEditHdl, SvTreeListBox*, bool); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -263,10 +263,10 @@ private: bool bReplaceEditChanged:1; bool bSWriter:1; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); void RefillReplaceBox( bool bFromReset, @@ -323,10 +323,10 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, @@ -393,8 +393,8 @@ private: sal_UCS4 cStartQuote; sal_UCS4 cEndQuote; - DECL_LINK_TYPED( QuoteHdl, Button*, void ); - DECL_LINK_TYPED( StdQuoteHdl, Button*, void ); + DECL_LINK( QuoteHdl, Button*, void ); + DECL_LINK( StdQuoteHdl, Button*, void ); OUString ChangeStringExt_Impl( sal_UCS4 ); @@ -451,7 +451,7 @@ private: editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; - DECL_LINK_TYPED( CheckHdl, CheckBox&, void ); + DECL_LINK( CheckHdl, CheckBox&, void ); OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -466,7 +466,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; void CopyToClipboard() const; - DECL_LINK_TYPED(DeleteHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -502,21 +502,21 @@ private: Enables/disables all controls in the tab page (except from the check box. */ - DECL_LINK_TYPED(CheckHdl, CheckBox&, void); + DECL_LINK(CheckHdl, CheckBox&, void); /** Handler for the push button Calls the displayPropertyPage function of the smart tag recognizer associated with the currently selected smart tag type. */ - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); /** Handler for the list box Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); public: /// construction via Create() diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 49714edce8b1..9a4d2545b203 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -132,13 +132,13 @@ private: bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); - DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); - DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED(BackgroundColorHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED( TblDestinationHdl_Impl, ListBox&, void ); + DECL_LINK( LoadIdleHdl_Impl, Idle*, void ); + DECL_LINK(SelectHdl_Impl, ListBox&, void ); + DECL_LINK(BrowseHdl_Impl, Button*, void); + DECL_LINK( RadioClickHdl_Impl, Button*, void ); + DECL_LINK( FileClickHdl_Impl, Button*, void ); + DECL_LINK(BackgroundColorHdl_Impl, ValueSet*, void); + DECL_LINK( TblDestinationHdl_Impl, ListBox&, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index f2b2eaa1bb7f..c32dba59e174 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -118,15 +118,15 @@ private: std::set<sal_Int16> maUsedBorderStyles; // Handler - DECL_LINK_TYPED( SelStyleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelColHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void); - DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void); - DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); - DECL_LINK_TYPED( RemoveAdjacentCellBorderHdl_Impl, Button*, void); + DECL_LINK( SelStyleHdl_Impl, ListBox&, void ); + DECL_LINK( SelColHdl_Impl, ListBox&, void ); + DECL_LINK( SelPreHdl_Impl, ValueSet*, void ); + DECL_LINK( SelSdwHdl_Impl, ValueSet*, void ); + DECL_LINK( LinesChanged_Impl, LinkParamNone*, void ); + DECL_LINK( ModifyDistanceHdl_Impl, Edit&, void); + DECL_LINK( ModifyWidthHdl_Impl, Edit&, void); + DECL_LINK( SyncHdl_Impl, Button*, void); + DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c91fa99c4e97..6ca5756ab118 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -354,8 +354,8 @@ private: bool bInitialised; SaveInData* pCurrentSaveInData; - DECL_LINK_TYPED( SelectSaveInLocation, ListBox&, void ); - DECL_LINK_TYPED( AsyncInfoMsg, void*, void ); + DECL_LINK( SelectSaveInLocation, ListBox&, void ); + DECL_LINK( AsyncInfoMsg, void*, void ); protected: @@ -402,7 +402,7 @@ protected: SvxConfigPage( vcl::Window*, const SfxItemSet& ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( MoveHdl, Button *, void ); virtual SaveInData* CreateSaveInData( const css::uno::Reference< css::ui::XUIConfigurationManager >&, @@ -477,15 +477,15 @@ class SvxMenuConfigPage : public SvxConfigPage { private: bool m_bIsMenuBar; - DECL_LINK_TYPED( SelectMenu, ListBox&, void ); - DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void ); - DECL_LINK_TYPED( NewMenuHdl, Button *, void ); - DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( SelectMenu, ListBox&, void ); + DECL_LINK( SelectMenuEntry, SvTreeListBox *, void ); + DECL_LINK( NewMenuHdl, Button *, void ); + DECL_LINK( MenuSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); void Init() override; void UpdateButtonStates() override; @@ -521,9 +521,9 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); - DECL_LINK_TYPED( MoveHdl, Button *, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( MoveHdl, Button *, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); public: SvxMainMenuOrganizerDialog ( @@ -571,18 +571,18 @@ class SvxToolbarConfigPage : public SvxConfigPage { private: - DECL_LINK_TYPED( SelectToolbar, ListBox&, void ); - DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); - DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( StyleChangeHdl, Button *, void ); - DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( ResetTopLevelHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( SelectToolbar, ListBox&, void ); + DECL_LINK( SelectToolbarEntry, SvTreeListBox*, void ); + DECL_LINK( ToolbarSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( StyleChangeHdl, Button *, void ); + DECL_LINK( NewToolbarHdl, Button *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( ResetTopLevelHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( MoveHdl, Button *, void ); void UpdateButtonStates() override; short QueryReset() override; @@ -727,9 +727,9 @@ public: css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); - DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); - DECL_LINK_TYPED( ImportHdl, Button *, void ); - DECL_LINK_TYPED( DeleteHdl, Button *, void ); + DECL_LINK( SelectHdl, ToolBox *, void ); + DECL_LINK( ImportHdl, Button *, void ); + DECL_LINK( DeleteHdl, Button *, void ); }; class SvxIconReplacementDialog : public MessBox diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index b700b4507774..1dbda947bdd4 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -133,10 +133,10 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void ); - DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void ); + DECL_LINK( UpdateHdl_Impl, Idle *, void ); + DECL_LINK( FontModifyEditHdl_Impl, Edit&, void ); + DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void ); void FontModifyHdl_Impl(void*); public: @@ -222,11 +222,11 @@ private: bool FillItemSetColor_Impl( SfxItemSet& rSet ); void SelectHdl_Impl(ListBox*); - DECL_LINK_TYPED(SelectListBoxHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(UpdatePreview_Impl, ListBox&, void); - DECL_LINK_TYPED(ColorBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(SelectListBoxHdl_Impl, ListBox&, void); + DECL_LINK(CbClickHdl_Impl, Button*, void); + DECL_LINK(TristClickHdl_Impl, Button*, void); + DECL_LINK(UpdatePreview_Impl, ListBox&, void); + DECL_LINK(ColorBoxSelectHdl_Impl, ListBox&, void); public: virtual ~SvxCharEffectsPage() override; @@ -297,15 +297,15 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( SvxEscapement nEsc ); - DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FontModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); - DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void ); + DECL_LINK( PositionHdl_Impl, Button*, void ); + DECL_LINK( RotationHdl_Impl, Button*, void ); + DECL_LINK( FontModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoPositionHdl_Impl, Button*, void ); + DECL_LINK( FitToLineHdl_Impl, Button*, void ); + DECL_LINK( KerningSelectHdl_Impl, ListBox&, void ); + DECL_LINK( KerningModifyHdl_Impl, Edit&, void ); + DECL_LINK( LoseFocusHdl_Impl, Control&, void ); + DECL_LINK( ScaleWidthModifyHdl_Impl, Edit&, void ); public: virtual ~SvxCharPositionPage() override; @@ -350,8 +350,8 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, bool bStart ); - DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void); - DECL_LINK_TYPED(CharacterMapHdl_Impl, ListBox&, void ); + DECL_LINK(TwoLinesHdl_Impl, Button*, void); + DECL_LINK(CharacterMapHdl_Impl, ListBox&, void ); public: virtual ~SvxCharTwoLinesPage() override; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 362b9569f278..ab291494e7d3 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -57,8 +57,8 @@ private: void FillTypeLB(); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0d48662e830c..41382bb45949 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -83,15 +83,15 @@ private: const SubsetMap* pSubsetMap; enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16}; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(FontSelectHdl, ListBox&, void); - DECL_LINK_TYPED(SubsetSelectHdl, ListBox&, void); - DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void); - DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(DecimalCodeChangeHdl, Edit&, void); - DECL_LINK_TYPED(HexCodeChangeHdl, Edit&, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(FontSelectHdl, ListBox&, void); + DECL_LINK(SubsetSelectHdl, ListBox&, void); + DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void); + DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); + DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); + DECL_LINK(DecimalCodeChangeHdl, Edit&, void); + DECL_LINK(HexCodeChangeHdl, Edit&, void); static void fillAllSubsets(ListBox &rListBox); void selectCharByCode(Radix radix); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 5cc0ae265a5b..b61fd63adb16 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -157,23 +157,23 @@ protected: private: // Handler for the Controls - DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void ); - DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); - DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); + DECL_LINK( OnClickedFieldRadios, Button*, void ); + DECL_LINK(OnClickedSearchAgain, Button *, void); + DECL_LINK( OnClickedSpecialSettings, Button*, void ); - DECL_LINK_TYPED(OnSearchTextModified, Edit&, void); + DECL_LINK(OnSearchTextModified, Edit&, void); - DECL_LINK_TYPED( OnPositionSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); + DECL_LINK( OnPositionSelected, ListBox&, void ); + DECL_LINK( OnFieldSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFocusGrabbed, Control&, void ); - DECL_LINK_TYPED( OnCheckBoxToggled, CheckBox&, void ); + DECL_LINK( OnFocusGrabbed, Control&, void ); + DECL_LINK( OnCheckBoxToggled, CheckBox&, void ); - DECL_LINK_TYPED( OnContextSelection, ListBox&, void ); + DECL_LINK( OnContextSelection, ListBox&, void ); - DECL_LINK_TYPED( OnSearchProgress, const FmSearchProgress*, void ); + DECL_LINK( OnSearchProgress, const FmSearchProgress*, void ); - DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI + DECL_LINK( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI void initCommon( const css::uno::Reference< css::sdbc::XResultSet >& _rxCursor ); }; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 64343fbfa1f9..7fe1f00b1974 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -88,7 +88,7 @@ private: INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -96,7 +96,7 @@ public: virtual ~SearchProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); virtual short Execute() override; virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; @@ -133,7 +133,7 @@ private: rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -142,7 +142,7 @@ public: virtual ~TakeProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } virtual short Execute() override; @@ -158,9 +158,9 @@ private: GalleryTheme* pTheme; GalleryProgress aStatusProgress; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); - DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); - DECL_LINK_TYPED( ActualizeHdl, const INetURLObject&, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); + DECL_LINK( TimeoutHdl, Idle*, void ); + DECL_LINK( ActualizeHdl, const INetURLObject&, void ); public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); @@ -188,7 +188,7 @@ private: VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; - DECL_LINK_TYPED( ClickOkHdl, Button*, void ); + DECL_LINK( ClickOkHdl, Button*, void ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog() override; @@ -278,16 +278,16 @@ class TPGalleryThemeProperties : public SfxTabPage void TakeFiles(); void DoPreview(); - DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); - DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void ); - DECL_LINK_TYPED( SelectFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectFileTypeHdl, ComboBox&, void ); - DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); - DECL_LINK_TYPED( EndSearchProgressHdl, Dialog&, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( ClickPreviewHdl, Button*, void ); + DECL_LINK( ClickSearchHdl, Button*, void ); + DECL_LINK( ClickTakeHdl, Button*, void ); + DECL_LINK( ClickTakeAllHdl, Button*, void ); + DECL_LINK( SelectFoundHdl, ListBox&, void ); + DECL_LINK( SelectFileTypeHdl, ComboBox&, void ); + DECL_LINK( DClickFoundHdl, ListBox&, void ); + DECL_LINK( PreviewTimerHdl, Timer*, void ); + DECL_LINK( EndSearchProgressHdl, Dialog&, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 53874f2255bb..ad3803a960df 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -73,8 +73,8 @@ private: Size maSizePixel; bool bIsBitmap; - DECL_LINK_TYPED( ImplPreviewTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( ImplModifyHdl, LinkParamNone*, void); + DECL_LINK( ImplPreviewTimeoutHdl, Timer *, void ); + DECL_LINK( ImplModifyHdl, LinkParamNone*, void); protected: VclPtr<GraphicPreviewWindow> mpPreview; @@ -95,7 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog { private: VclPtr<NumericField> mpMtrRadius; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -113,8 +113,8 @@ private: VclPtr<MetricField> mpMtrWidth; VclPtr<MetricField> mpMtrHeight; VclPtr<CheckBox> mpCbxEdges; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, @@ -133,8 +133,8 @@ class GraphicFilterSolarize : public GraphicFilterDialog private: VclPtr<MetricField> mpMtrThreshold; VclPtr<CheckBox> mpCbxInvert; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -152,7 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: VclPtr<MetricField> mpMtrSepia; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); @@ -169,7 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: VclPtr<NumericField> mpNumPoster; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 95cea405e05a..056e4cd0eb9b 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -68,9 +68,9 @@ private: bool mbReadOnly : 1; bool mbIsHTMLDoc : 1; - DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); + DECL_LINK (ClickOkHdl_Impl, Button *, void ); + DECL_LINK (ClickApplyHdl_Impl, Button *, void ); + DECL_LINK (ClickCloseHdl_Impl, Button *, void ); protected: virtual bool Close() override; diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index b4bedc9c18d5..5f1065ada287 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -49,7 +49,7 @@ private: // "name" fields unsigned nShortNameField; - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); bool GetData_Impl(); void SetData_Impl(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 86f5119aae80..0c103cc22e71 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -94,7 +94,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -156,12 +156,12 @@ class SvxTransparenceTabPage : public SvxTabPage XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); + DECL_LINK(ClickTransOffHdl_Impl, Button*, void ); + DECL_LINK(ClickTransLinearHdl_Impl, Button*, void ); + DECL_LINK(ClickTransGradientHdl_Impl, Button*, void ); + DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrEditHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); void ModifiedTrgrHdl_Impl(void*); void ActivateLinear(bool bActivate); @@ -239,15 +239,15 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); + DECL_LINK(SelectDialogTypeHdl_Impl, ListBox&, void); + DECL_LINK( ModifyColorHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyGradientHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHatchingHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyBitmapHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); + DECL_LINK( ModifyTileHdl_Impl, Edit&, void ); + DECL_LINK( ModifyTileClickHdl_Impl, Button*, void ); + DECL_LINK( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); void ClickHatchingHdl_Impl(); void ClickGradientHdl_Impl(); @@ -318,9 +318,9 @@ private: SfxItemSet& m_rXFSet; MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void ); + DECL_LINK( ClickShadowHdl_Impl, Button*, void ); + DECL_LINK( ModifyShadowHdl_Impl, Edit&, void ); + DECL_LINK( SelectShadowHdl_Impl, ListBox&, void ); public: SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -389,16 +389,16 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeGradientHdl, ValueSet*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangeGradientHdl, ValueSet*, void ); void ChangeGradientHdl_Impl(); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAutoStepHdl_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAutoStepHdl_Impl, CheckBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -470,18 +470,18 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void ); + DECL_LINK( ChangeHatchHdl, ValueSet*, void ); void ChangeHatchHdl_Impl(); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); + DECL_LINK( ModifiedBackgroundHdl_Impl, ListBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); sal_Int32 SearchHatchList(const OUString& rHatchName); @@ -568,16 +568,16 @@ private: sal_Int64 nFilledHeightPercent; sal_Int64 nZoomedWidthPercent; sal_Int64 nZoomedHeightPercent; - DECL_LINK_TYPED( ModifyBitmapHdl, ValueSet*, void ); - DECL_LINK_TYPED( ClickScaleHdl, Button*, void ); - DECL_LINK_TYPED( ModifyBitmapStyleHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapSizeHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyBitmapPositionHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyPositionOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ClickRenameHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickImportHdl, Button*, void ); + DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); + DECL_LINK( ClickScaleHdl, Button*, void ); + DECL_LINK( ModifyBitmapStyleHdl, ListBox&, void ); + DECL_LINK( ModifyBitmapSizeHdl, Edit&, void ); + DECL_LINK( ModifyBitmapPositionHdl, ListBox&, void ); + DECL_LINK( ModifyPositionOffsetHdl, Edit&, void ); + DECL_LINK( ModifyTileOffsetHdl, Edit&, void ); + DECL_LINK( ClickRenameHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickImportHdl, Button*, void ); void ClickBitmapHdl_Impl(); void CalculateBitmapPresetSize(); sal_Int32 SearchBitmapList(const OUString& rBitmapName); @@ -646,12 +646,12 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangePatternHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( ChangeColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangePatternHdl_Impl, ValueSet*, void ); + DECL_LINK( ChangeColorHdl_Impl, ListBox&, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); public: SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -766,19 +766,19 @@ private: void ImpColorCountChanged(); void FillPaletteLB(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickWorkOnHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectPaletteLBHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelectColorModeHdl_Impl, RadioButton&, void ); + DECL_LINK( SelectPaletteLBHdl, ListBox&, void ); + DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); + DECL_LINK( SelectColorModeHdl_Impl, RadioButton&, void ); void ChangeColor(const Color &rNewColor); void SetColorModel(ColorModel eModel); void ChangeColorModel(); void UpdateColorValues(); static sal_Int32 SearchColorList(OUString const & aColorName); - DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedHdl_Impl, Edit&, void ); void UpdateModified(); css::uno::Reference< css::uno::XComponentContext > m_context; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index fc84623aa6b2..07f101f2c993 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -60,7 +60,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -168,29 +168,29 @@ private: sal_Int32 m_nActLineWidth; // handler for gallery popup menu button + size - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - - DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( MenuCreateHdl_Impl, MenuButton *, void ); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + + DECL_LINK( ClickInvisibleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeStartListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartModifyHdl_Impl, Edit&, void ); void ChangeStartHdl_Impl(void*); - DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeEndListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEndModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangeEndClickHdl_Impl, Button*, void ); void ChangeEndHdl_Impl(void*); - DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangePreviewListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewModifyHdl_Impl, Edit&, void ); void ChangePreviewHdl_Impl(void*); - DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void ); + DECL_LINK( ChangeTransparentHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEdgeStyleHdl_Impl, ListBox&, void ); // LineCaps - DECL_LINK_TYPED( ChangeCapStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeCapStyleHdl_Impl, ListBox&, void ); void FillXLSet_Impl(); @@ -285,18 +285,18 @@ private: void FillDash_Impl(); void FillDialog_Impl(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); void SelectLinestyleHdl_Impl(ListBox*); - DECL_LINK_TYPED( ChangePreviewHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber1Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber2Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectTypeListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewHdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber1Hdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber2Hdl_Impl, Edit&, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( ChangeMetricHdl_Impl, Button*, void ); + DECL_LINK( SelectTypeListBoxHdl_Impl, ListBox&, void ); void SelectTypeHdl_Impl(ListBox*); void CheckChanges_Impl(); @@ -361,12 +361,12 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosLineEndLb; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLineEndHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( SelectLineEndHdl_Impl, ListBox&, void ); void ChangePreviewHdl_Impl(); void CheckChanges_Impl(); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3a120616f54f..80b6638ece00 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,16 +51,16 @@ namespace svx sal_uLong m_nOldCount; bool m_bModified; - DECL_LINK_TYPED( NewHdl, Button*, void ); - DECL_LINK_TYPED( EditHdl, Button*, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( PathBoxDoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK( NewHdl, Button*, void ); + DECL_LINK( EditHdl, Button*, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( PathBoxDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( NameValidator, const OUString&, bool); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( NameValidator, const OUString&, bool); /** inserts a new entry in the tablistbox diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 07dc6d03e4c3..11dbed3de84a 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -36,7 +36,7 @@ private: Link<SvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); @@ -49,7 +49,7 @@ public: field is changed. The Link result determines whether the OK Button is enabled (> 0) or disabled (== 0). - @param rLink a Callback declared with DECL_LINK_TYPED and implemented with + @param rLink a Callback declared with DECL_LINK and implemented with IMPL_LINK, that is executed on modification. @param bCheckImmediately If true, the Link is called directly after @@ -85,7 +85,7 @@ private: // callback link for name uniqueness Link<SvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: // constructor @@ -138,8 +138,8 @@ private: VclPtr<FixedImage> pFtImage; Image* pImage; - DECL_LINK_TYPED(Button1Hdl, Button*, void); - DECL_LINK_TYPED(Button2Hdl, Button*, void); + DECL_LINK(Button1Hdl, Button*, void); + DECL_LINK(Button2Hdl, Button*, void); public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index bfbd63a293eb..a750bdb26597 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage virtual ~SvxGrfCropPage() override; virtual void dispose() override; - DECL_LINK_TYPED( ZoomHdl, Edit&, void ); - DECL_LINK_TYPED( SizeHdl, Edit&, void ); - DECL_LINK_TYPED( CropHdl, SpinField&, void ); - DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( CropModifyHdl, Edit&, void ); - DECL_LINK_TYPED( OrigSizeHdl, Button*, void ); - DECL_LINK_TYPED( Timeout, Timer *, void ); + DECL_LINK( ZoomHdl, Edit&, void ); + DECL_LINK( SizeHdl, Edit&, void ); + DECL_LINK( CropHdl, SpinField&, void ); + DECL_LINK( CropLoseFocusHdl, Control&, void ); + DECL_LINK( CropModifyHdl, Edit&, void ); + DECL_LINK( OrigSizeHdl, Button*, void ); + DECL_LINK( Timeout, Timer *, void ); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index bf29f12f9582..91c55eb3a2b1 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -79,8 +79,8 @@ namespace svx virtual void LoseFocus() override; virtual void Command( const CommandEvent& rCEvt ) override; - DECL_LINK_TYPED( SelectSuggestionListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectSuggestionListBoxHdl, ListBox&, void ); + DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(Control*); void SetHelpIds(); @@ -182,11 +182,11 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK_TYPED( OnOption, Button*, void ); - DECL_LINK_TYPED( OnSuggestionModified, Edit&, void ); - DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void ); - DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); - DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); + DECL_LINK( OnOption, Button*, void ); + DECL_LINK( OnSuggestionModified, Edit&, void ); + DECL_LINK( OnSuggestionSelected, SuggestionDisplay&, void ); + DECL_LINK( OnConversionDirectionClicked, Button*, void ); + DECL_LINK( ClickByCharacterHdl, Button*, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); @@ -212,11 +212,11 @@ namespace svx HHDictList m_aDictList; css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( NewDictHdl, Button*, void ); - DECL_LINK_TYPED( EditDictHdl, Button*, void ); - DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( DictsLB_SelectHdl, SvTreeListBox*, void ); + DECL_LINK( NewDictHdl, Button*, void ); + DECL_LINK( EditDictHdl, Button*, void ); + DECL_LINK( DeleteDictHdl, Button*, void ); void Init(); ///< reads settings from core and init controls public: @@ -236,8 +236,8 @@ namespace svx bool m_bEntered; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog() override; @@ -291,16 +291,16 @@ namespace svx bool m_bModifiedSuggestions; bool m_bModifiedOriginal; - DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EditModifyHdl1, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl2, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl3, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl4, Edit&, void ); + DECL_LINK( OriginalModifyHdl, Edit&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EditModifyHdl1, Edit&, void ); + DECL_LINK( EditModifyHdl2, Edit&, void ); + DECL_LINK( EditModifyHdl3, Edit&, void ); + DECL_LINK( EditModifyHdl4, Edit&, void ); - DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); - DECL_LINK_TYPED( DeletePBPushHdl, Button*, void ); + DECL_LINK( BookLBSelectHdl, ListBox&, void ); + DECL_LINK( NewPBPushHdl, Button*, void ); + DECL_LINK( DeletePBPushHdl, Button*, void ); void InitEditDictDialog( sal_uInt32 _nSelDict ); void UpdateOriginalLB(); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 5fc81255614c..085213fc9eb1 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -30,7 +30,7 @@ private: VclPtr<HeaderBar> maHeaderBar; VclPtr<SvHeaderTabListBox> maListBox; protected: - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); virtual bool Notify( NotifyEvent& rNEvt ) override; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 7be89e1aee9f..82bf563f53cd 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -39,7 +39,7 @@ private: bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); + DECL_LINK (ClickNewHdl_Impl, Button*, void ); protected: void FillDlgFields(const OUString& rStrURL) override; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 59622ec19965..be739f471468 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -41,15 +41,15 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); - DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); + DECL_LINK (ClickFileopenHdl_Impl, Button*, void ); + DECL_LINK (ClickTargetHdl_Impl , Button*, void ); - DECL_LINK_TYPED (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified - DECL_LINK_TYPED (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified + DECL_LINK (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus + DECL_LINK( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 42cf3c6c51c0..f10bf5a0b297 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -46,13 +46,13 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User - DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified - DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus - DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP + DECL_LINK( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User + DECL_LINK( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified + DECL_LINK( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus + DECL_LINK( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9385d25f799d..349437d1ef2e 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,9 +35,9 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); + DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book - DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified + DECL_LINK (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); void RemoveImproperProtocol(const OUString& aProperScheme); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index f497ab0f1ccc..b652f8c24b1b 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,9 +86,9 @@ protected: virtual void Move () override; - DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ClickCloseHdl_Impl, Button*, void ); + DECL_LINK( ClickApplyHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2c2193e82565..4f24e11e0d04 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -97,7 +97,7 @@ protected: OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script + DECL_LINK (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script static OUString GetSchemeFromURL( const OUString& rStrURL ); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 7fc2a335527a..f5adb46d55d8 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -70,14 +70,14 @@ class SvxHyphenWordDialog : public SfxModalDialog void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default sal_uInt16 GetHyphIndex_Impl(); - DECL_LINK_TYPED(Left_Impl, Button*, void); - DECL_LINK_TYPED(Right_Impl, Button*, void); - DECL_LINK_TYPED(CutHdl_Impl, Button*, void); - DECL_LINK_TYPED(ContinueHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED( HyphenateAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED(CancelHdl_Impl, Button*, void); - DECL_LINK_TYPED(GetFocusHdl_Impl, Control&, void); + DECL_LINK(Left_Impl, Button*, void); + DECL_LINK(Right_Impl, Button*, void); + DECL_LINK(CutHdl_Impl, Button*, void); + DECL_LINK(ContinueHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK( HyphenateAllHdl_Impl, Button*, void ); + DECL_LINK(CancelHdl_Impl, Button*, void); + DECL_LINK(GetFocusHdl_Impl, Control&, void); public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index eb8a7432f576..66a61d114f41 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -120,11 +120,11 @@ private: bool bInOK; - DECL_LINK_TYPED( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ApplyHdl, Button*, void) ; - DECL_LINK_TYPED( ResetHdl, Button*, void) ; - DECL_LINK_TYPED( CancelHdl, Button*, void ); + DECL_LINK( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ApplyHdl, Button*, void) ; + DECL_LINK( ResetHdl, Button*, void) ; + DECL_LINK( CancelHdl, Button*, void ); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index b982ba8ff93b..40dffa18087c 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -69,9 +69,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl css::uno::Sequence< sal_Int8 > m_aIconMetaFile; OUString m_aIconMediaType; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RadioHdl, Button*, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RadioHdl, Button*, void); void SelectDefault(); ListBox& GetObjectTypes() { return *m_pLbObjecttype; } @@ -115,8 +115,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_LINK_TYPED(OpenHdl, Button*, void ); - DECL_LINK_TYPED(CheckHdl, Button*, void ); + DECL_LINK(OpenHdl, Button*, void ); + DECL_LINK(CheckHdl, Button*, void ); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 52e9fd7ab717..7935a9f75a76 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -70,10 +70,10 @@ private: void SetupAnsatz_Impl( sal_uInt16 nType ); void SetupType_Impl( SdrCaptionType nType ); - DECL_LINK_TYPED( AnsatzSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AnsatzRelSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); - DECL_LINK_TYPED( SelectCaptTypeHdl_Impl, ValueSet*, void ); + DECL_LINK( AnsatzSelectHdl_Impl, ListBox&, void ); + DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LineOptHdl_Impl, Button *, void ); + DECL_LINK( SelectCaptTypeHdl_Impl, ValueSet*, void ); const SfxItemSet& rOutAttrs; const SdrView* pView; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 3d1006a512fe..313b2cfa7646 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -64,15 +64,15 @@ class SvBaseLinksDlg : public ModalDialog bool bHtmlMode; Idle aUpdateIdle; - DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( LinksDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); - DECL_LINK_TYPED( ManualClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateNowClickHdl, Button *, void); - DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void ); - DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); - DECL_LINK_TYPED( EndEditHdl, sfx2::SvBaseLink&, void ); + DECL_LINK( LinksSelectHdl, SvTreeListBox*, void ); + DECL_LINK( LinksDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( AutomaticClickHdl, Button *, void ); + DECL_LINK( ManualClickHdl, Button *, void ); + DECL_LINK( UpdateNowClickHdl, Button *, void); + DECL_LINK( ChangeSourceClickHdl, Button *, void ); + DECL_LINK( BreakLinkClickHdl, Button *, void ); + DECL_LINK( UpdateWaitingHdl, Idle *, void ); + DECL_LINK( EndEditHdl, sfx2::SvBaseLink&, void ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, SfxLinkUpdateMode nType ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 056f337a53b5..66906fda727d 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -36,14 +36,14 @@ class SfxMacroTabPage_Impl; class SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectMacro_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); + DECL_LINK( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( AssignDeleteClickHdl_Impl, Button *, void ); bool AssignDeleteHdl(Control *); - DECL_LINK_TYPED( TimeOut_Impl, Idle*, void ); + DECL_LINK( TimeOut_Impl, Idle*, void ); protected: std::unique_ptr<SfxMacroTabPage_Impl> mpImpl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index fb9860012a11..8767b671360f 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -58,9 +58,9 @@ class SvxMacroTabPage_Impl; class SvxMacroTabPage_ : public SfxTabPage { - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( AssignDeleteHdl_Impl, Button *, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); static long GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn ); @@ -118,7 +118,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_LINK_TYPED( OKHdl_Impl, Button *, void ); + DECL_LINK( OKHdl_Impl, Button *, void ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index d2f632252991..1cece6f8cab7 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -60,10 +60,10 @@ private: void FillUnitLB(); - DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoPosHdl_Impl, Button*, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrClickHdl_Impl, Button*, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 03b86343f0cf..f059a55bcca1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -43,10 +43,10 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(CheckHdl_Impl, SvTreeListBox*, void); public: SvxMultiPathDialog(vcl::Window* pParent); @@ -64,9 +64,9 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); public: SvxPathSelectDialog(vcl::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index fac8bccfe8dd..0446cbf047e7 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -149,17 +149,17 @@ private: void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); bool Click_Impl(PushButton* pIB); // Handler - DECL_LINK_TYPED( LostFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); + DECL_LINK( LostFocusHdl_Impl, Control&, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelFormatListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( SelFormatClickHdl_Impl, Button*, void ); void SelFormatHdl_Impl(void*); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( OptEditHdl_Impl, Edit&, void ); + DECL_LINK( OptClickHdl_Impl, Button*, void ); + DECL_LINK( TimeHdl_Impl, Timer *, void); void EditHdl_Impl(Edit*); void OptHdl_Impl(void*); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6b7e70b771c3..101f62f28c0d 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(vcl::Window* pParent, @@ -129,8 +129,8 @@ class SvxBulletPickTabPage : public SfxTabPage OUString sBulletCharFormatName; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,8 +172,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(vcl::Window* pParent, @@ -217,9 +217,9 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bPreset : 1; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -315,22 +315,22 @@ class SvxNumOptionsTabPage : public SfxTabPage void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); - DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); - DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK( NumberTypeSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( PopupActivateHdl_Impl, MenuButton *, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( BulletHdl_Impl, Button*, void); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( EditListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( AllLevelHdl_Impl, Edit&, void ); + DECL_LINK( OrientHdl_Impl, ListBox&, void ); + DECL_LINK( SameLevelHdl_Impl, Button*, void ); + DECL_LINK( BulColorHdl_Impl, ListBox&, void ); + DECL_LINK( BulRelSizeHdl_Impl, Edit&, void); + DECL_LINK( PreviewInvalidateHdl_Impl, Timer *, void); void EditModifyHdl_Impl(Edit*); public: @@ -410,23 +410,23 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, ListBox&, void); + DECL_LINK( DistanceHdl_Impl, SpinField&, void ); + DECL_LINK( DistanceFocusHdl_Impl, Control&, void ); + DECL_LINK( RelativeHdl_Impl, Button*, void ); + DECL_LINK( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); public: SvxNumPositionTabPage(vcl::Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 8f00b697aed8..ce3070fb02e8 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -48,9 +48,9 @@ class SvxAsianLayoutPage : public SfxTabPage std::unique_ptr<SvxAsianLayoutPage_Impl> pImpl; - DECL_LINK_TYPED(LanguageHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(LanguageHdl, ListBox&, void); + DECL_LINK(ChangeStandardHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 21bb74699162..4cfa42b73913 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -57,8 +57,8 @@ private: css::uno::Reference< css::linguistic2::XDictionary > xNewDic; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); public: SvxNewDictionaryDialog( vcl::Window* pParent ); @@ -120,12 +120,12 @@ private: bool bDoNothing; bool bDicIsReadonly; - DECL_LINK_TYPED(SelectBookHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectLangHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectBookHdl_Impl, ListBox&, void); + DECL_LINK(SelectLangHdl_Impl, ListBox&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, SvxDictEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index b841937a96c2..3742d5291996 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -74,14 +74,14 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpDownHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BackHdl_Impl, Button*, void ); - DECL_LINK_TYPED( LangSelectListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( UpDownHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( BackHdl_Impl, Button*, void ); + DECL_LINK( LangSelectListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void LangSelectHdl_Impl(ListBox*); public: @@ -138,12 +138,12 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); - DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl_Impl, Button *, void ); + DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( PostDblClickHdl_Impl, void *, void); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index cb279f3a109c..914cbc74d1c5 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,15 +53,15 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK_TYPED( PathHdl_Impl, Button*, void); - DECL_LINK_TYPED( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( PathHdl_Impl, Button*, void); + DECL_LINK( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( StandardHdl_Impl, Button*, void); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 951d35179861..c0cd03089449 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -150,26 +150,26 @@ private: bool mbEnableDrawingLayerFillStyles : 1; void Init_Impl(); - DECL_LINK_TYPED( LayoutHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void); - DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); + DECL_LINK( LayoutHdl_Impl, ListBox&, void); + DECL_LINK( PaperBinHdl_Impl, Control&, void); + DECL_LINK( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK_TYPED( BorderModify_Impl, Edit&, void); + DECL_LINK( BorderModify_Impl, Edit&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); + DECL_LINK( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); - DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void ); - DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void); + DECL_LINK( PaperSizeSelect_Impl, ListBox&, void ); + DECL_LINK( PaperSizeModify_Impl, Edit&, void); - DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void ); + DECL_LINK( FrameDirectionModify_Impl, ListBox&, void ); void ResetBackground_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( RangeHdl_Impl, Control&, void ); + DECL_LINK( RangeHdl_Impl, Control&, void ); void CalcMargin_Impl(); - DECL_LINK_TYPED( RegisterModify, Button*, void ); + DECL_LINK( RegisterModify, Button*, void ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index d16a057c5246..8b621f217bfe 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -90,9 +90,9 @@ private: void Init_Impl(); void UpdateExample_Impl(); - DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); + DECL_LINK( LineDistHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoHdl_Impl, Button*, void ); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; @@ -102,7 +102,7 @@ public: virtual ~SvxStdParagraphTabPage() override; virtual void dispose() override; - DECL_LINK_TYPED(ELRLoseFocusHdl, Control&, void); + DECL_LINK(ELRLoseFocusHdl, Control&, void); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } @@ -153,9 +153,9 @@ class SvxParaAlignTabPage : public SfxTabPage VclPtr<VclFrame> m_pPropertiesFL; VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; - DECL_LINK_TYPED(AlignHdl_Impl, Button*, void); - DECL_LINK_TYPED(LastLineHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(TextDirectionHdl_Impl, ListBox&, void); + DECL_LINK(AlignHdl_Impl, Button*, void); + DECL_LINK(LastLineHdl_Impl, ListBox&, void); + DECL_LINK(TextDirectionHdl_Impl, ListBox&, void); void UpdateExample_Impl(); @@ -256,14 +256,14 @@ private: bool bHtmlMode; sal_uInt16 nStdPos; - DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); - DECL_LINK_TYPED(KeepTogetherHdl_Impl, Button*, void); - DECL_LINK_TYPED(WidowHdl_Impl, Button*, void); - DECL_LINK_TYPED(OrphanHdl_Impl, Button*, void); - DECL_LINK_TYPED(HyphenClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); - DECL_LINK_TYPED( PageBreakPosHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PageBreakTypeHdl_Impl, ListBox&, void ); + DECL_LINK(PageBreakHdl_Impl, Button*, void); + DECL_LINK(KeepTogetherHdl_Impl, Button*, void); + DECL_LINK(WidowHdl_Impl, Button*, void); + DECL_LINK(OrphanHdl_Impl, Button*, void); + DECL_LINK(HyphenClickHdl_Impl, Button*, void); + DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void ); + DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; @@ -279,7 +279,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); + DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); public: virtual ~SvxAsianTabPage() override; diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index b4d6c413569d..b43f4731d50a 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -50,8 +50,8 @@ class SvPasteObjectDialog : public ModalDialog FixedText& ObjectSource() { return *m_pFtObjectSource; } void SelectObject(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); public: SvPasteObjectDialog( vcl::Window* pParent ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 4a2c53fc3303..9c351b1c9193 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -94,10 +94,10 @@ private: Link<SvxPostItDialog&,void> aPrevHdlLink; Link<SvxPostItDialog&,void> aNextHdlLink; - DECL_LINK_TYPED(Stamp, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(PrevHdl, Button*, void); - DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK(Stamp, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(PrevHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); }; #endif diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 428d6d831170..7a582ed20ccc 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -152,8 +152,8 @@ protected: const OUString m_renameErrStr; const OUString m_renameErrTitleStr; - DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ScriptSelectHdl, SvTreeListBox *, void ); + DECL_LINK( ButtonHdl, Button *, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); @@ -185,7 +185,7 @@ private: OUString m_sMessage; - DECL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, void ); + DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, void ); public: diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 6f8e20c97284..826a4ccefe34 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -92,7 +92,7 @@ friend class SvxConfigGroupListBox; SvxGroupInfoArr_Impl aArr; SvTreeListEntry* m_pDraggingEntry; - DECL_LINK_TYPED(TimerHdl, Timer *, void); + DECL_LINK(TimerHdl, Timer *, void); virtual void MouseMove( const MouseEvent& rMEvt ) override; public: @@ -187,9 +187,9 @@ class SvxScriptSelectorDialog : public ModalDialog bool m_bShowSlots; Link<SvxScriptSelectorDialog&,void> m_aAddHdl; - DECL_LINK_TYPED( ClickHdl, Button *, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( FunctionDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ClickHdl, Button *, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( FunctionDoubleClickHdl, SvTreeListBox*, bool ); void UpdateUI(); diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 6fad2cda4f06..4fce7ae2550b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -48,7 +48,7 @@ public: void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); protected: - DECL_LINK_TYPED(OnClickedOk, Button*, void); + DECL_LINK(OnClickedOk, Button*, void); }; #endif // INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 3fc5b5e6dcaa..df85c2f73cb8 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -41,7 +41,7 @@ public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg() override; - DECL_LINK_TYPED( ClickHdl, Button *, void ); + DECL_LINK( ClickHdl, Button *, void ); virtual bool IsHorizontal() const override; virtual bool IsProportional() const override; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 85f889920cc9..876111059e25 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -60,7 +60,7 @@ private: SearchAttrItemList& rList; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index ebc4a7d74523..aa5f90a7175d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -100,14 +100,14 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - DECL_LINK_TYPED(RangeModifyHdl, Control&, void); - DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); - DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); - DECL_LINK_TYPED( PosHdl, ListBox&, void ); - DECL_LINK_TYPED( RelHdl, ListBox&, void ); - DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED(ProtectHdl, Button*, void); + DECL_LINK(RangeModifyHdl, Control&, void); + DECL_LINK(RangeModifyClickHdl, Button*, void); + DECL_LINK(AnchorTypeHdl, Button*, void); + DECL_LINK( PosHdl, ListBox&, void ); + DECL_LINK( RelHdl, ListBox&, void ); + DECL_LINK(MirrorHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 6fd0c44485c2..77505c1090ab 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -107,17 +107,17 @@ private: void SetFillAndTabType_Impl(); // Handler - DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void ); + DECL_LINK( NewHdl_Impl, Button*, void ); + DECL_LINK( DelHdl_Impl, Button*, void ); + DECL_LINK( DelAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( FillTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( TabTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); - DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); + DECL_LINK( SelectHdl_Impl, ComboBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( GetFillCharHdl_Impl, Control&, void ); + DECL_LINK( GetDezCharHdl_Impl, Control&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 3bfb857094a6..8469f3601637 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -65,11 +65,11 @@ private: FieldUnit eFUnit; MapUnit eUnit; - DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDirectionHdl_Impl, Button*, void ); + DECL_LINK( SelectEffectHdl_Impl, ListBox&, void ); + DECL_LINK( ClickEndlessHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoHdl_Impl, Button*, void ); + DECL_LINK( ClickPixelHdl_Impl, Button*, void ); + DECL_LINK( ClickDirectionHdl_Impl, Button*, void ); void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index c60a743f5460..88b77845d134 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -70,8 +70,8 @@ private: bool bWordWrapTextEnabled; bool bFitToSizeEnabled; - DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); + DECL_LINK( ClickFullWidthHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index ab0f46517d2e..1efd4921ca30 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -45,7 +45,7 @@ public: virtual ~LookUpComboBox() override; virtual void dispose() override; - DECL_LINK_TYPED( ModifyTimer_Hdl, Idle *, void ); + DECL_LINK( ModifyTimer_Hdl, Idle *, void ); void init(SvxThesaurusDialog *pDialog); @@ -142,14 +142,14 @@ public: const OUString& getErrStr() const { return m_aErrStr; } // Handler - DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LanguageHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( WordSelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); - - DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); + DECL_LINK( ReplaceBtnHdl_Impl, Button *, void ); + DECL_LINK( LeftBtnHdl_Impl, Button *, void ); + DECL_LINK( LanguageHdl_Impl, ListBox&, void ); + DECL_LINK( WordSelectHdl_Impl, ComboBox&, void ); + DECL_LINK( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); + + DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index ee7f474c9a5c..1728a30c9b60 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -124,16 +124,16 @@ private: RectPoint meRP; - DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void ); - DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void ); + DECL_LINK( ChangePosProtectHdl, Button*, void ); + DECL_LINK( ChangeSizeProtectHdl, Button*, void ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); - DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); - DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); + DECL_LINK( ChangeWidthHdl, Edit&, void ); + DECL_LINK( ChangeHeightHdl, Edit&, void ); + DECL_LINK( ClickSizeProtectHdl, Button*, void ); + DECL_LINK( ClickAutoHdl, Button*, void ); public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 832ab1a1ec89..c497b8367163 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -162,10 +162,10 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(BackHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK(ShowPageHdl_Impl, SvTreeListBox*, void); + DECL_LINK(BackHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) override; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 7235e0e764bd..7620a46f687b 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -48,12 +48,12 @@ private: std::unique_ptr<SfxItemSet> mpOutSet; bool mbModified; - DECL_LINK_TYPED(UserHdl, Button*, void); - DECL_LINK_TYPED(SpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); - DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(UserHdl, Button*, void); + DECL_LINK(SpinHdl, Edit&, void); + DECL_LINK(ViewLayoutUserHdl, Button*, void); + DECL_LINK(ViewLayoutSpinHdl, Edit&, void); + DECL_LINK(ViewLayoutCheckHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index cc0955fedf91..18ad0b14abac 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -115,7 +115,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent) AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); } -IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl, Button*, void) { try { @@ -161,7 +161,7 @@ void CertPathDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void ) +IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pCertPathList->GetEntry(m_pCertPathList->GetCurMousePoint()) : m_pCertPathList->FirstSelected(); @@ -213,7 +213,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath HandleCheckEntry(pEntry); } -IMPL_LINK_NOARG_TYPED(CertPathDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl, Button*, void) { try { diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 42fbf49288c2..528f4fbc79e0 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -26,9 +26,9 @@ private: OUString m_sAddDialogText; OUString m_sManual; - DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(CheckHdl_Impl, SvTreeListBox*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 0cd9fb241577..9362469caf3a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -409,7 +409,7 @@ namespace offapp } - IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnDriverRowChanged, const DriverPooling*, pDriverPos, void ) + IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const DriverPooling*, pDriverPos, void ) { bool bValidRow = (nullptr != pDriverPos); m_pDriverPoolingEnabled->Enable(bValidRow && m_pEnablePooling->IsChecked()); @@ -441,7 +441,7 @@ namespace offapp } - IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void ) + IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void ) { bool bGloballyEnabled = m_pEnablePooling->IsChecked(); bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 3204c1e39e2a..e143b39fd9c1 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -61,8 +61,8 @@ namespace offapp virtual void ActivatePage( const SfxItemSet& _rSet) override; protected: - DECL_LINK_TYPED( OnEnabledDisabled, Button*, void ); - DECL_LINK_TYPED( OnDriverRowChanged, const DriverPooling*, void ); + DECL_LINK( OnEnabledDisabled, Button*, void ); + DECL_LINK( OnDriverRowChanged, const DriverPooling*, void ); void implInitControls(const SfxItemSet& _rSet, bool _bFromReset); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index a8cd6ea7b4b7..be470fc95c0b 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -269,7 +269,7 @@ void DbRegistrationOptionsPage::FillUserData() SetUserData( aUserData ); } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); if ( pEntry ) @@ -280,20 +280,20 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, Button*, void) { OUString sNewName,sNewLocation; openLinkDialog(sNewName,sNewLocation); } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool) { EditHdl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry(); if ( !pEntry ) @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -339,7 +339,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -370,7 +370,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar } -IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); @@ -428,7 +428,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O } } -IMPL_LINK_TYPED( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bool ) +IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bool ) { sal_uLong nCount = m_pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index 6ecc562e66ed..600d6cb3f871 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -103,7 +103,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnOk, Button*, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk, Button*, void) { // get the current URL OUString sURL = m_pURL->GetText(); @@ -160,7 +160,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile, Button*, void) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); @@ -204,7 +204,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnTextModified, Edit&, void) + IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified, Edit&, void) { validate( ); } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 6cc26cfa3793..6406ae737ee5 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -59,9 +59,9 @@ namespace svx void getLink( OUString& _rName, OUString& _rURL ) const; protected: - DECL_LINK_TYPED( OnTextModified, Edit&, void ); - DECL_LINK_TYPED( OnBrowseFile, Button*, void ); - DECL_LINK_TYPED( OnOk, Button*, void ); + DECL_LINK( OnTextModified, Edit&, void ); + DECL_LINK( OnBrowseFile, Button*, void ); + DECL_LINK( OnOk, Button*, void ); void validate( ); }; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 239e6895b4d0..9abe7d4db52b 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -253,19 +253,19 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_pFontHeightLB->SaveValue(); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) +IMPL_LINK(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) { SelectHdl(pButton); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void) +IMPL_LINK(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void) { SelectHdl(pButton); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void) +IMPL_LINK(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void) { SelectHdl(&rBox); } -IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void) +IMPL_LINK(SvxFontSubstTabPage, SelectEditHdl, Edit&, rBox, void) { SelectHdl(&rBox); } @@ -344,7 +344,7 @@ void SvxFontSubstTabPage::SelectHdl(vcl::Window* pWin) } -IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) +IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 9a73817c1fe4..4c5e7bf670f5 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -81,11 +81,11 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK_TYPED(SelectEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectComboBoxHdl, ComboBox&, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NonPropFontsHdl, Button*, void); + DECL_LINK(SelectEditHdl, Edit&, void); + DECL_LINK(SelectComboBoxHdl, ComboBox&, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(TreeListBoxSelectHdl, SvTreeListBox*, void); + DECL_LINK(NonPropFontsHdl, Button*, void); void SelectHdl(vcl::Window*); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 15d354472bf0..a6c06a9c4ba4 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -562,18 +562,18 @@ void CuiAboutConfigValueDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) { Reset(); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool ) { StandardHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); if(pEntry == nullptr) @@ -808,7 +808,7 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void) { m_pPrefBox->Clear(); m_pPrefBox->SetUpdateMode( false ); @@ -905,7 +905,7 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) m_pPrefBox->Expand( pParentEntry ); } -IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool ) +IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index ad762bfd076d..91641d1616b7 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -59,11 +59,11 @@ private: static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString ); void InsertEntry( SvTreeListEntry *pEntry); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SearchHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( StandardHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( ResetBtnHdl_Impl, Button*, void ); + DECL_LINK( SearchHdl_Impl, Button*, void ); + DECL_LINK( ExpandingHdl_Impl, SvTreeListBox*, bool ); public: explicit CuiAboutConfigTabPage(vcl::Window* pParent); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index ed4341aa6b0e..c9c99ecb6830 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -308,7 +308,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet* ) LanguageHdl(*m_pLanguageLB); } -IMPL_LINK_NOARG_TYPED(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) { //set current value LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage(); @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxAsianLayoutPage, LanguageHdl, ListBox&, void) m_pEndED->SetText(sEnd); } -IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) +IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) { bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pStartED->Enable(!bCheck); @@ -382,7 +382,7 @@ IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) ModifyHdl(*m_pStartED); } -IMPL_LINK_TYPED(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit&, rEdit, void) { LanguageType eSelectLanguage = m_pLanguageLB->GetSelectLanguage(); Locale aLocale( LanguageTag::convertToLocale( eSelectLanguage )); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7c668a36aaf4..3d95da759c74 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -178,7 +178,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) // ResetToDefaults -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) { if( pColorConfig ) { @@ -195,7 +195,7 @@ IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) // AddChartColor -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) { if( pColorConfig ) { @@ -214,7 +214,7 @@ IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void) // RemoveChartColor -IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) +IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos(); @@ -245,7 +245,7 @@ IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, voi } } -IMPL_LINK_TYPED( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) +IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) { Color aCol = static_cast<ColorLB&>(_rBox).GetSelectEntryColor(); @@ -257,7 +257,7 @@ IMPL_LINK_TYPED( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, _rBox, void ) m_pValSetColorBox->SelectItem( nIndex + 1 ); // ValueSet is 1-based } -IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) { sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 1be71a4c546d..34cd2113f2a3 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -43,11 +43,11 @@ private: SvxChartColorTableItem* pColorConfig; XColorListRef pColorList; - DECL_LINK_TYPED( ResetToDefaults, Button *, void ); - DECL_LINK_TYPED( AddChartColor, Button *, void ); - DECL_LINK_TYPED( RemoveChartColor, Button *, void ); - DECL_LINK_TYPED( ListClickedHdl, ListBox&, void ); - DECL_LINK_TYPED(BoxClickedHdl, ValueSet*, void); + DECL_LINK( ResetToDefaults, Button *, void ); + DECL_LINK( AddChartColor, Button *, void ); + DECL_LINK( RemoveChartColor, Button *, void ); + DECL_LINK( ListClickedHdl, ListBox&, void ); + DECL_LINK(BoxClickedHdl, ValueSet*, void); void FillColorBox(); long GetColorIndex( const Color& rCol ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 16db5dcb5747..e41c82a09e07 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -843,10 +843,10 @@ class ColorConfigCtrl_Impl : public VclVBox EditableColorConfig* pColorConfig; EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(ClickHdl, Button*, void); - DECL_LINK_TYPED(ColorHdl, ListBox&, void); - DECL_LINK_TYPED(ControlFocusHdl, Control&, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); + DECL_LINK(ClickHdl, Button*, void); + DECL_LINK(ColorHdl, ListBox&, void); + DECL_LINK(ControlFocusHdl, Control&, void); virtual bool PreNotify (NotifyEvent& rNEvt) override; virtual void Command (CommandEvent const& rCEvt) override; @@ -947,7 +947,7 @@ void ColorConfigCtrl_Impl::Update () m_pScrollWindow->Update(pColorConfig, pExtColorConfig); } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar, void) +IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar, void) { m_pScrollWindow->ScrollHdl(*pScrollBar); } @@ -998,19 +998,19 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void) +IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set"); m_pScrollWindow->ClickHdl(pColorConfig, static_cast<CheckBox*>(pBox)); } // a color list has changed -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ColorHdl, ListBox&, rBox, void) +IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ListBox&, rBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set" ); m_pScrollWindow->ColorHdl(pColorConfig, pExtColorConfig, static_cast<ColorListBox*>(&rBox)); } -IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) +IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) { // determine whether a control is completely visible // and make it visible @@ -1171,14 +1171,14 @@ void SvxColorOptionsTabPage::UpdateColorConfig() m_pColorConfigCT->Update(); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void) { pColorConfig->LoadScheme(rBox.GetSelectEntry()); pExtColorConfig->LoadScheme(rBox.GetSelectEntry()); UpdateColorConfig(); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) +IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) { if (m_pSaveSchemePB == pButton) { @@ -1222,7 +1222,7 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 ); } -IMPL_LINK_TYPED(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool ) +IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool ) { OUString sName; rDialog.GetName(sName); diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index f65db335551f..f91a2312be5b 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -41,9 +41,9 @@ class SvxColorOptionsTabPage : public SfxTabPage svtools::EditableColorConfig* pColorConfig; svtools::EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK_TYPED(SchemeChangedHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); + DECL_LINK(SchemeChangedHdl_Impl, ListBox&, void); + DECL_LINK(SaveDeleteHdl_Impl, Button*, void); + DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); void UpdateColorConfig(); public: diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 4ef91cbfafb8..4f258008d0cb 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -24,7 +24,7 @@ // class SvxCTLOptionsPage ----------------------------------------------------- -IMPL_LINK_NOARG_TYPED(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void) +IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void) { bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index bafe3b48abe3..b377fda219be 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -39,7 +39,7 @@ private: VclPtr<ListBox> m_pNumeralsLB; - DECL_LINK_TYPED( SequenceCheckingCB_Hdl, Button*, void ); + DECL_LINK( SequenceCheckingCB_Hdl, Button*, void ); public: SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index b3db8c2e6d6d..a44d7d15c279 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -129,7 +129,7 @@ void SvxNewDictionaryDialog::dispose() } -IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) { // add extension for personal dictionaries @@ -200,7 +200,7 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) { if ( !pNameEdit->GetText().isEmpty() ) pOKBtn->Enable(); @@ -421,7 +421,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) } -IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) { sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); @@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, voi } -IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos(); sal_Int32 nLang = pLangLB->GetSelectLanguage(); @@ -547,7 +547,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) { if(!bDoNothing) { @@ -572,12 +572,12 @@ IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) }; -IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(static_cast<PushButton*>(pBtn)); } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelActionHdl, SvxDictEdit&, rDictEdit, bool) +IMPL_LINK(SvxEditDictionaryDialog, NewDelActionHdl, SvxDictEdit&, rDictEdit, bool) { return NewDelHdl(&rDictEdit); } @@ -677,7 +677,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) } -IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) { OUString rEntry = rEdt.GetText(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index e7f3057902a8..d3c9fc1002c8 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -73,12 +73,12 @@ void OfaMSFilterTabPage::dispose() } -IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void) { aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() ); } -IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) { aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() ); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 3253ccfca25b..4e28a04ad883 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -37,8 +37,8 @@ class OfaMSFilterTabPage : public SfxTabPage VclPtr<CheckBox> aPBasicStgCB; - DECL_LINK_TYPED(LoadWordBasicCheckHdl_Impl, Button*, void); - DECL_LINK_TYPED(LoadExcelBasicCheckHdl_Impl, Button*, void); + DECL_LINK(LoadWordBasicCheckHdl_Impl, Button*, void); + DECL_LINK(LoadExcelBasicCheckHdl_Impl, Button*, void); public: OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage() override; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index fcbe8c9ce338..78f5ad6b99a4 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -406,7 +406,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_pCollectUsageInfo->SaveValue(); } -IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) +IMPL_LINK_NOARG( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) { OUString aOutput( m_aStrDateInfo ); OUString aStr( m_pYearValueField->GetText() ); @@ -425,11 +425,11 @@ IMPL_LINK_NOARG_TYPED( OfaMiscTabPage, TwoFigureHdl, Edit&, void ) m_pToYearFT->SetText( aOutput ); } -IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) +IMPL_LINK( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) { TwoFigureConfigHdl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void ) +IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void ) { sal_Int64 nNum = m_pYearValueField->GetValue(); OUString aOutput(OUString::number(nNum)); @@ -727,7 +727,7 @@ void OfaViewTabPage::dispose() } #if defined( UNX ) -IMPL_LINK_NOARG_TYPED( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) +IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) { bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); @@ -1717,7 +1717,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) } } -IMPL_LINK_TYPED( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void ) +IMPL_LINK( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); @@ -1756,7 +1756,7 @@ namespace } } -IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) +IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) { SvxLanguageBox* pBox = static_cast<SvxLanguageBox*>(&rListBox); LanguageType eLang = pBox->GetSelectLanguage(); @@ -1805,7 +1805,7 @@ IMPL_LINK_TYPED( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void m_pDatePatternsED->SetText( aDatePatternsString); } -IMPL_LINK_TYPED( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void ) +IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit&, rEd, void ) { const OUString aPatterns( rEd.GetText()); OUStringBuffer aBuf( aPatterns); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index b204930eb035..b6bc275551df 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -57,9 +57,9 @@ private: VclPtr<CheckBox> m_pCollectUsageInfo; - DECL_LINK_TYPED( TwoFigureHdl, Edit&, void ); - DECL_LINK_TYPED( TwoFigureConfigHdl, SpinField&, void ); - DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); + DECL_LINK( TwoFigureHdl, Edit&, void ); + DECL_LINK( TwoFigureConfigHdl, SpinField&, void ); + DECL_LINK( TwoFigureConfigFocusHdl, Control&, void ); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; @@ -117,7 +117,7 @@ private: std::vector<vcl::IconThemeInfo> mInstalledIconThemes; #if defined( UNX ) - DECL_LINK_TYPED( OnAntialiasingToggled, CheckBox&, void ); + DECL_LINK( OnAntialiasingToggled, CheckBox&, void ); #endif void UpdateOGLStatus(); @@ -163,9 +163,9 @@ class OfaLanguagesTabPage : public SfxTabPage bool m_bDatePatternsValid; - DECL_LINK_TYPED( SupportHdl, Button*, void ) ; - DECL_LINK_TYPED( LocaleSettingHdl, ListBox&, void ) ; - DECL_LINK_TYPED( DatePatternsHdl, Edit&, void ) ; + DECL_LINK( SupportHdl, Button*, void ) ; + DECL_LINK( LocaleSettingHdl, ListBox&, void ) ; + DECL_LINK( DatePatternsHdl, Edit&, void ) ; public: OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index bccdb88610ce..559e5690cce8 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -317,7 +317,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) // ModifyHdl_Impl() // This handler updates the initials (short name) // when the name field was updated. -IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) { // short name field and row Field& rShortName = *vFields[nShortNameField]; diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a54e17f63871..2f449abbddd3 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -182,7 +182,7 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() ); } -IMPL_LINK_TYPED(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void) +IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void) { aStarBasicWarningCB->Enable(!static_cast<CheckBox*>(pBox)->IsChecked()); } diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 5d578039451e..55b7281cab60 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -47,7 +47,7 @@ class OfaHtmlTabPage : public SfxTabPage VclPtr<CheckBox> aSaveGrfLocalCB; VclPtr<SvxTextEncodingBox> aCharSetLB; - DECL_LINK_TYPED(CheckBoxHdl_Impl, Button*, void); + DECL_LINK(CheckBoxHdl_Impl, Button*, void); public: virtual ~OfaHtmlTabPage() override; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index fc817a31d4b8..064764916ac3 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -527,7 +527,7 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable) } -IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -541,7 +541,7 @@ IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) } -IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) +IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) { Edit* pEdit = static_cast<Edit*>(&rControl); OUString aValue = pEdit->GetText(); @@ -630,14 +630,14 @@ void SvxSecurityTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void) { if ( !mpSecOptDlg ) mpSecOptDlg = VclPtr<svx::SecurityOptionsDialog>::Create( this, mpSecOptions ); mpSecOptDlg->Execute(); } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, Button*, void) { try { @@ -690,7 +690,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void) } } -IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, Button*, void) { try { @@ -704,7 +704,7 @@ IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, voi {} } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) { try { @@ -746,7 +746,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) { try { @@ -763,7 +763,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) {} } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void) { if (!mpCertPathDlg) mpCertPathDlg = VclPtr<CertPathDialog>::Create(this); @@ -778,7 +778,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) { // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between // invocations. Seems clearer to my little brain that way. @@ -788,7 +788,7 @@ IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) pTSAURLsDlg->Execute(); } -IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) { try { @@ -1026,7 +1026,7 @@ void SvxEMailTabPage::Reset( const SfxItemSet* ) /* -------------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) +IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) { if (m_pMailerURLPB == pButton && !pImpl->bROProgram) { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 7ae2fd20a1d3..fd0850870a60 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -86,8 +86,8 @@ private: void ReadConfigDefaults_Impl(); void RestoreConfigDefaults_Impl(); - DECL_LINK_TYPED( ProxyHdl_Impl, ListBox&, void ); - DECL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void ); + DECL_LINK( ProxyHdl_Impl, ListBox&, void ); + DECL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void ); public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -133,14 +133,14 @@ private: OUString m_sPasswordStoringDeactivateStr; - DECL_LINK_TYPED(SecurityOptionsHdl, Button*, void); - DECL_LINK_TYPED(SavePasswordHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void); - DECL_LINK_TYPED(MasterPasswordCBHdl, Button*, void); - DECL_LINK_TYPED(ShowPasswordsHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); - DECL_LINK_TYPED(CertPathPBHdl, Button*, void ); - DECL_LINK_TYPED(TSAURLsPBHdl, Button*, void ); + DECL_LINK(SecurityOptionsHdl, Button*, void); + DECL_LINK(SavePasswordHdl, Button*, void); + DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, Button*, void); + DECL_LINK(MasterPasswordCBHdl, Button*, void); + DECL_LINK(ShowPasswordsHdl, Button*, void); + DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); + DECL_LINK(CertPathPBHdl, Button*, void ); + DECL_LINK(TSAURLsPBHdl, Button*, void ); void InitControls(); @@ -173,7 +173,7 @@ class SvxEMailTabPage : public SfxTabPage std::unique_ptr<SvxEMailTabPage_Impl> pImpl; - DECL_LINK_TYPED( FileDialogHdl_Impl, Button*, void ); + DECL_LINK( FileDialogHdl_Impl, Button*, void ); public: SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 70db94543c09..9ddc4fff0cf8 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -238,7 +238,7 @@ void SvxJavaOptionsPage::dispose() } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) { bool bEnable = m_pJavaEnableCB->IsChecked(); m_pJavaBox->Enable(bEnable); @@ -246,7 +246,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) +IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) : m_pJavaList->FirstSelected(); @@ -255,7 +255,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) { // set installation directory info SvTreeListEntry* pEntry = m_pJavaList->FirstSelected(); @@ -269,7 +269,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) { try { @@ -293,7 +293,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA Sequence< OUString > aParameterList; @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA OUString sClassPath; @@ -390,13 +390,13 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) { LoadJREs(); } -IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) { try { @@ -413,7 +413,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) } -IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) +IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) { @@ -424,7 +424,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, } -IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) +IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(this); pExpertConfigDlg->Reset();//initialize and reset function @@ -824,14 +824,14 @@ void SvxJavaParameterDlg::dispose() } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); m_pAssignBtn->Enable(!sParam.isEmpty()); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); if (!sParam.isEmpty()) @@ -847,26 +847,26 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, EditHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, EditHdl_Impl, Button*, void) { EditParameter(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) { EnableEditButton(); EnableRemoveButton(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) { EditParameter(); } -IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -996,7 +996,7 @@ void SvxJavaClassPathDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); @@ -1031,7 +1031,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -1066,7 +1066,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1085,7 +1085,7 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) { EnableRemoveButton(); } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 6a83b280e24e..4a4f7bbfd04a 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -84,18 +84,18 @@ private: rtl::Reference< ::svt::DialogClosedListener > xDialogListener; css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; - DECL_LINK_TYPED( EnableHdl_Impl, Button*, void); - DECL_LINK_TYPED( CheckHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( AddHdl_Impl, Button*, void); - DECL_LINK_TYPED( ParameterHdl_Impl, Button*, void); - DECL_LINK_TYPED( ClassPathHdl_Impl, Button*, void); - DECL_LINK_TYPED( ResetHdl_Impl, Idle *, void); + DECL_LINK( EnableHdl_Impl, Button*, void); + DECL_LINK( CheckHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK( AddHdl_Impl, Button*, void); + DECL_LINK( ParameterHdl_Impl, Button*, void); + DECL_LINK( ClassPathHdl_Impl, Button*, void); + DECL_LINK( ResetHdl_Impl, Idle *, void); - DECL_LINK_TYPED( StartFolderPickerHdl, void *, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( StartFolderPickerHdl, void *, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); - DECL_LINK_TYPED( ExpertConfigHdl_Impl, Button*, void); + DECL_LINK( ExpertConfigHdl_Impl, Button*, void); void ClearJavaInfo(); void ClearJavaList(); @@ -129,13 +129,13 @@ private: VclPtr<PushButton> m_pEditBtn; - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); + DECL_LINK(AssignHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); + DECL_LINK(DblClickHdl_Impl, ListBox&, void); + DECL_LINK(RemoveHdl_Impl, Button*, void); - DECL_LINK_TYPED(EditHdl_Impl, Button*, void); + DECL_LINK(EditHdl_Impl, Button*, void); inline void EnableRemoveButton() { m_pRemoveBtn->Enable( @@ -183,10 +183,10 @@ private: OUString m_sOldPath; - DECL_LINK_TYPED(AddArchiveHdl_Impl, Button*, void); - DECL_LINK_TYPED(AddPathHdl_Impl, Button*, void); - DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); + DECL_LINK(AddArchiveHdl_Impl, Button*, void); + DECL_LINK(AddPathHdl_Impl, Button*, void); + DECL_LINK(RemoveHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); bool IsPathDuplicate( const OUString& _rPath ); inline void EnableRemoveButton() diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7a16eae7fe72..fc9f3c612240 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1496,7 +1496,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } -IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) +IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) { if (pBox == m_pLinguModulesCLB) { @@ -1514,20 +1514,20 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, } -IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) +IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) { ClickHdl_Impl(m_pLinguModulesEditPB); } -IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) +IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); lcl_OpenURL( sURL ); } -IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) +IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) { if (pBox == m_pLinguModulesCLB) { @@ -1556,7 +1556,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, } -IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) { if (m_pLinguModulesEditPB == pBtn) { @@ -1734,7 +1734,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } -IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pLinguModulesCLB == pBox) { @@ -1913,7 +1913,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol return pEntry; } -IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) +IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pModulesCLB == pBox) { @@ -1947,11 +1947,11 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } } -IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ) +IMPL_LINK_NOARG( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ) { BoxCheckButtonHdl_Impl(nullptr); } -IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void ) +IMPL_LINK_NOARG( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void ) { SvTreeListEntry *pCurEntry = m_pModulesCLB->GetCurEntry(); if (pCurEntry) @@ -1979,7 +1979,7 @@ IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox } } -IMPL_LINK_TYPED( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxEditModulesDlg, LangSelectListBoxHdl_Impl, ListBox&, rBox, void ) { LangSelectHdl_Impl(&rBox); } @@ -2238,7 +2238,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) aLastLocale = aCurLocale; } -IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) { bool bUp = m_pPrioUpPB == pBtn; sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); @@ -2266,21 +2266,21 @@ IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) } } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, ClickHdl_Impl, Button*, void) { // store language config LangSelectHdl_Impl(m_pLanguageLB); EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl, Button*, void) { rLinguData = *pDefaultLinguData; LangSelectHdl_Impl(nullptr); } -IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) +IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); lcl_OpenURL( sURL ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 31cc66dce7b9..27cb5b48f383 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -252,12 +252,12 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) m_pQuickLaunchCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheLoseFocusHdl, Control&, void) { GraphicCacheConfigHdl(*m_pNfGraphicCache); } -IMPL_LINK_NOARG_TYPED(OfaMemoryOptionsPage, GraphicCacheConfigHdl, SpinField&, void) +IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl, SpinField&, void) { sal_Int32 n = GetNfGraphicCacheVal(); SetNfGraphicObjectCacheMax( n ); diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index 3906d9350bca..68605b19e961 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -41,8 +41,8 @@ private: VclPtr<VclContainer> m_pQuickStarterFrame; VclPtr<CheckBox> m_pQuickLaunchCB; - DECL_LINK_TYPED(GraphicCacheConfigHdl, SpinField&, void); - DECL_LINK_TYPED(GraphicCacheLoseFocusHdl, Control&, void); + DECL_LINK(GraphicCacheConfigHdl, SpinField&, void); + DECL_LINK(GraphicCacheLoseFocusHdl, Control&, void); sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 1045772f2491..05612b57f5ef 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -129,7 +129,7 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable) } -IMPL_STATIC_LINK_NOARG_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void) +IMPL_STATIC_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void) { } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index c24d5253935a..e6560202d5d4 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -37,7 +37,7 @@ private: VclPtr<FixedText> mpOclUsed; VclPtr<FixedText> mpOclNotUsed; - DECL_STATIC_LINK_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void); + DECL_STATIC_LINK(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void); static void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 4f45c9787ca0..88d7fd5b6eb8 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -387,7 +387,7 @@ void SvxPathTabPage::FillUserData() } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) { sal_uInt16 nSelCount = 0; SvTreeListEntry* pEntry = pPathBox->FirstSelected(); @@ -408,7 +408,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) @@ -536,13 +536,13 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) { PathHdl_Impl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != nullptr ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0; @@ -666,7 +666,7 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) return; @@ -693,7 +693,7 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) } -IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if (!pBar || !pBar->GetCurItemId()) return; @@ -721,7 +721,7 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } } -IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) +IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if (RET_OK == pEvt->DialogResult) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 1130bb882ee6..de06da1b0e03 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -509,7 +509,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) } -IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) { if ( pBox == aAutoSaveCB ) { @@ -553,7 +553,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties) return sName; } -IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) { const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos(); @@ -616,7 +616,7 @@ IMPL_LINK_TYPED( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) ODFVersionHdl_Impl( *aSaveAsLB ); }; -IMPL_LINK_NOARG_TYPED(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void) { sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() ); bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 0c64f774d3d2..53e80181d150 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -59,9 +59,9 @@ private: std::unique_ptr<SvxSaveTabPage_Impl> pImpl; - DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FilterHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(ODFVersionHdl_Impl, ListBox&, void ); + DECL_LINK( AutoClickHdl_Impl, Button*, void ); + DECL_LINK( FilterHdl_Impl, ListBox&, void ); + DECL_LINK(ODFVersionHdl_Impl, ListBox&, void ); void DetectHiddenControls(); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 518e3a118c62..58bd1aa60a00 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -336,7 +336,7 @@ void SvxOnlineUpdateTabPage::FillUserData() { } -IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void ) { bool bEnabled = static_cast<CheckBox*>(pBox)->IsChecked(); beans::Property aProperty = m_xReadWriteAccess->getPropertyByHierarchicalName("/org.openoffice.Office.Jobs/Jobs/org.openoffice.Office.Jobs:Job['UpdateCheck']/Arguments/CheckInterval"); @@ -346,12 +346,12 @@ IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void m_pEveryMonthButton->Enable(bEnabled && !bReadOnly); } -IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, Button*, , void ) +IMPL_LINK( SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, Button*, , void ) { UpdateUserAgent(); } -IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext); @@ -371,7 +371,7 @@ IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 5ff091163d97..788ae988f92e 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -45,10 +45,10 @@ private: OUString m_aNeverChecked; OUString m_aLastCheckedTemplate; - DECL_LINK_TYPED(FileDialogHdl_Impl, Button*, void); - DECL_LINK_TYPED(CheckNowHdl_Impl, Button*, void); - DECL_LINK_TYPED(AutoCheckHdl_Impl, Button*, void); - DECL_LINK_TYPED(ExtrasCheckHdl_Impl, Button*, void); + DECL_LINK(FileDialogHdl_Impl, Button*, void); + DECL_LINK(CheckNowHdl_Impl, Button*, void); + DECL_LINK(AutoCheckHdl_Impl, Button*, void); + DECL_LINK(ExtrasCheckHdl_Impl, Button*, void); css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess; css::uno::Reference<css::configuration::XReadWriteAccess> m_xReadWriteAccess; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 4b2658f2aab5..956e7c1d5022 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -122,7 +122,7 @@ OUString SelectPersonaDialog::GetSelectedPersona() const return OUString(); } -IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) +IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) { /* * English category names should be used for search. @@ -171,7 +171,7 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) m_pSearchThread->launch(); } -IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void ) +IMPL_LINK_NOARG( SelectPersonaDialog, ActionOK, Button*, void ) { OUString aSelectedPersona = GetSelectedPersona(); @@ -189,7 +189,7 @@ IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void ) } } -IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void ) +IMPL_LINK_NOARG( SelectPersonaDialog, ActionCancel, Button*, void ) { if( m_pSearchThread.is() ) m_pSearchThread->StopExecution(); @@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void ) EndDialog(); } -IMPL_LINK_TYPED( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) +IMPL_LINK( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) { if( m_pSearchThread.is() ) m_pSearchThread->StopExecution(); @@ -486,7 +486,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes() } } -IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void ) +IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectPersona, Button*, void ) { ScopedVclPtrInstance< SelectPersonaDialog > aDialog(nullptr); @@ -500,13 +500,13 @@ IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void ) } } -IMPL_LINK_TYPED( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void ) +IMPL_LINK( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void ) { if ( pButton == m_pOwnPersona && m_aPersonaSettings.isEmpty() ) SelectPersona( m_pSelectPersona ); } -IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void ) +IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void ) { m_pDefaultPersona->Check(); for( sal_Int32 nIndex = 0; nIndex < 3; nIndex++ ) @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, vo } } -IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, void) +IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, void) { m_pOwnPersona->Check(); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 65bb8470ca55..c2053a15e42e 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -63,16 +63,16 @@ public: private: /// Handle the Persona selection - DECL_LINK_TYPED( SelectPersona, Button*, void ); + DECL_LINK( SelectPersona, Button*, void ); /// When 'own' is chosen, but the Persona is not chosen yet. - DECL_LINK_TYPED( ForceSelect, Button*, void ); + DECL_LINK( ForceSelect, Button*, void ); /// Handle the default Persona selection - DECL_LINK_TYPED( DefaultPersona, Button*, void ); + DECL_LINK( DefaultPersona, Button*, void ); /// Handle the Personas installed through extensions selection - DECL_LINK_TYPED( SelectInstalledPersona, ListBox&, void ); + DECL_LINK( SelectInstalledPersona, ListBox&, void ); }; /** Dialog that will allow the user to choose a Persona to use. */ @@ -107,10 +107,10 @@ public: private: /// Handle the Search button - DECL_LINK_TYPED( SearchPersonas, Button*, void ); - DECL_LINK_TYPED( SelectPersona, Button*, void ); - DECL_LINK_TYPED( ActionOK, Button*, void ); - DECL_LINK_TYPED( ActionCancel, Button*, void ); + DECL_LINK( SearchPersonas, Button*, void ); + DECL_LINK( SelectPersona, Button*, void ); + DECL_LINK( ActionOK, Button*, void ); + DECL_LINK( ActionCancel, Button*, void ); }; class SearchAndParseThread: public salhelper::Thread diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 4a5c51fbd886..716bb2a253e1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -638,12 +638,12 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName, return nRet - 1; } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void) { SelectHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) { if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) { @@ -659,7 +659,7 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) { pTreeLB->EndSelection(); if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) @@ -709,7 +709,7 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) } // an opened group shall be completely visible -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox, void ) { pBox->Update(); diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 2c5e8a849bdd..505b8f66638b 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -52,7 +52,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent) } } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, OKHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl, Button*, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); @@ -92,7 +92,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL) m_pURLListBox->SetUpdateMode(true); } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl, Button*, void) { OUString aURL; OUString aDesc( get<FixedText>("enteraurl")->GetText() ); @@ -109,7 +109,7 @@ IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(TSAURLsDialog, DeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos(); diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 5d321e8cc34d..0ab0cf81d0b0 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -21,9 +21,9 @@ private: VclPtr<PushButton> m_pDeleteBtn; VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); std::set<OUString> m_aURLs; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 67d244b8e005..21ed6daa0e88 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -154,7 +154,7 @@ void WebConnectionInfoDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_TYPED( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void ) +IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable, void ) { m_pPasswordsLB->Resort( nullptr == pTable ); } @@ -205,7 +205,7 @@ void WebConnectionInfoDialog::FillPasswordList() } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) { try { @@ -235,7 +235,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void) { try { @@ -257,7 +257,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, v } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) { try { @@ -293,7 +293,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( !pEntry ) diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index b829aa969c03..24c29aa69ee3 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -50,11 +50,11 @@ namespace svx VclPtr<PushButton> m_pChangeBtn; sal_Int32 m_nPos; - DECL_LINK_TYPED( HeaderBarClickedHdl, SvSimpleTable*, void ); - DECL_LINK_TYPED( RemovePasswordHdl, Button*, void ); - DECL_LINK_TYPED( RemoveAllPasswordsHdl, Button*, void ); - DECL_LINK_TYPED( ChangePasswordHdl, Button*, void ); - DECL_LINK_TYPED( EntrySelectedHdl, SvTreeListBox*, void ); + DECL_LINK( HeaderBarClickedHdl, SvSimpleTable*, void ); + DECL_LINK( RemovePasswordHdl, Button*, void ); + DECL_LINK( RemoveAllPasswordsHdl, Button*, void ); + DECL_LINK( ChangePasswordHdl, Button*, void ); + DECL_LINK( EntrySelectedHdl, SvTreeListBox*, void ); void FillPasswordList(); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 98653e3c3aab..aa6ea21dd25c 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -417,12 +417,12 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n return eMethodOld != eMethodNew; } -IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableClickHdl, Button*, void) +IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableClickHdl, Button*, void) { UpdateEnableControls(); } -IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) +IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) { UpdateEnableControls(); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index bcfe6e8b592b..64ab34f826f5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -174,7 +174,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, return false; } -IMPL_LINK_TYPED(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) +IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) { sal_Int32 nPos = rBox.GetSelectEntryPos(); void* pVoid = rBox.GetEntryData(nPos); @@ -715,18 +715,18 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) m_pCheckLB->SetUpdateMode(true); } -IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) { m_pEditPB->Enable(nullptr != pBox->FirstSelected()->GetUserData()); } -IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) { EditHdl(nullptr); return false; } -IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) { sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos(); if( nSelEntryPos == REPLACE_BULLETS || @@ -1119,7 +1119,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) } } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) +IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) { if(!bFirstSelect || !bHasSelectionText) { @@ -1209,12 +1209,12 @@ void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString& rDeletedArray.push_back(aDeletedString); } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(OfaAutocorrReplacePage, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(pBtn); } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) +IMPL_LINK(OfaAutocorrReplacePage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) { return NewDelHdl(&rEdit); } @@ -1288,7 +1288,7 @@ bool OfaAutocorrReplacePage::NewDelHdl(void* pBtn) return true; } -IMPL_LINK_TYPED(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit&, rEdt, void) { SvTreeListEntry* pFirstSel = m_pReplaceTLB->FirstSelected(); bool bShort = &rEdt == m_pShortED; @@ -1659,12 +1659,12 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) m_pAutoCapsCB->SaveValue(); } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelButtonHdl, Button*, pBtn, void) +IMPL_LINK(OfaAutocorrExceptPage, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(pBtn); } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) +IMPL_LINK(OfaAutocorrExceptPage, NewDelActionHdl, AutoCorrEdit&, rEdit, bool) { return NewDelHdl(&rEdit); } @@ -1696,7 +1696,7 @@ bool OfaAutocorrExceptPage::NewDelHdl(void* pBtn) return false; } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) +IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) { if (&rBox == m_pAbbrevLB) { @@ -1712,7 +1712,7 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) } } -IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) +IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) { // sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); const OUString& sEntry = rEdt.GetText(); @@ -2050,7 +2050,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* ) #define DBL_END 3 -IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) +IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) { sal_uInt16 nMode = SGL_START; if (pBtn == m_pSglEndQuotePB) @@ -2122,7 +2122,7 @@ IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) } } -IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) +IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) { if (pBtn == m_pDblStandardPB) { @@ -2357,7 +2357,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage( false ); } -IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) { sal_Int32 nSelCnt = (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0; @@ -2371,7 +2371,7 @@ IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) } } -IMPL_LINK_TYPED( OfaAutoCompleteTabPage, CheckHdl, CheckBox&, rBox, void ) +IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox&, rBox, void ) { bool bEnable = rBox.IsChecked(); if (&rBox == m_pCBActiv) @@ -2577,7 +2577,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) /** Handler for the push button */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) { const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); @@ -2592,7 +2592,7 @@ IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) /** Handler for the check box */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) { const bool bEnable = m_pMainCB->IsChecked(); m_pSmartTagTypesLB->Enable( bEnable ); @@ -2609,7 +2609,7 @@ IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) /** Handler for the list box */ -IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) { if ( m_pSmartTagTypesLB->GetEntryCount() < 1 ) return; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 16cbc1d72266..741928dbc352 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1133,7 +1133,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() // Handler /** Handler, called when color selection is changed */ -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void) { sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : Color( COL_TRANSPARENT ); @@ -1141,7 +1141,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, m_pPreviewWin1->NotifyChange( aBgdColor ); } -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) { if ( drawing::FillStyle_SOLID == lcl_getFillStyle(m_pLbSelect) ) { @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, SelectHdl_Impl, ListBox&, void) } } -IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) { if (m_pBtnLink == pBox) { @@ -1199,7 +1199,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) } } -IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) { if (pBtn == m_pBtnPosition) { @@ -1219,7 +1219,7 @@ IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) /** Handler, called by pressing the browse button. Create graphic/insert dialog, set path and start. */ -IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) { if ( pPageImpl->pLoadIdle->IsActive() ) return; @@ -1255,7 +1255,7 @@ IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) Graphic is only loaded, if it's different to the current graphic. */ -IMPL_LINK_TYPED( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) +IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) { if ( pIdle == pPageImpl->pLoadIdle ) { @@ -1314,7 +1314,7 @@ void SvxBackgroundTabPage::ShowTblControl() m_pAsGrid->Show(); } -IMPL_LINK_TYPED( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nSelPos = rBox.GetSelectEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index d061a480d908..f94fb4aba33c 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -799,7 +799,7 @@ void SvxBorderTabPage::HideShadowControls() } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FrameBorderState::Show; const svx::FrameBorderState HIDE = svx::FrameBorderState::Hide; @@ -870,7 +870,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_pWndShadows->GetSelectItemId() > 1; m_pFtShadowSize->Enable(bEnable); @@ -880,7 +880,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) { ColorListBox* pColLb = static_cast<ColorListBox*>(&rLb); @@ -891,7 +891,7 @@ IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) } } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) { sal_Int64 nVal = static_cast<sal_Int64>(MetricField::ConvertDoubleValue( m_pLineWidthMF->GetValue( ), @@ -904,7 +904,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) { if (&rLb == m_pLbLineStyle) { @@ -1116,7 +1116,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() } -IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) { if(!mbUseMarginItem && m_pLeftMF->IsVisible()) { @@ -1193,7 +1193,7 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) } -IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) { if ( mbSync ) { @@ -1209,12 +1209,12 @@ IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) } } -IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) +IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) { mbSync = static_cast<CheckBox*>(pBox)->IsChecked(); } -IMPL_LINK_TYPED( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, Button*, pBox, void) +IMPL_LINK( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, Button*, pBox, void) { mbRemoveAdjacentCellBorders = static_cast<CheckBox*>(pBox)->IsChecked(); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 9f325160e104..444fd626376e 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1164,21 +1164,21 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } -IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) { UpdatePreview_Impl(); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxCharNamePage, FontModifyEditHdl_Impl, Edit&, rBox, void ) { FontModifyHdl_Impl(&rBox); } @@ -1692,7 +1692,7 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) } -IMPL_LINK_TYPED( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) { SelectHdl_Impl(&rBox); } @@ -1728,7 +1728,7 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) { bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) || ( m_pOverlineLB->GetSelectEntryPos() > 0 ) || @@ -1739,19 +1739,19 @@ IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } -IMPL_LINK_TYPED( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); SvxFont& rFont = GetPreviewFont(); @@ -2762,7 +2762,7 @@ void SvxCharPositionPage::SetEscapement_Impl( SvxEscapement nEsc ) } -IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { SvxEscapement nEsc = SvxEscapement::Off; // also when pBtn == NULL @@ -2775,7 +2775,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) } -IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) { bool bEnable = false; if (m_p90degRB == pBtn || m_p270degRB == pBtn) @@ -2786,7 +2786,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) { sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue(); short nEsc = (short)m_pHighLowMF->GetValue(); @@ -2795,7 +2795,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) { if ( static_cast<CheckBox*>(pBox)->IsChecked() ) { @@ -2809,7 +2809,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void } -IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) { if (m_pFitToLineCB == pBox) { @@ -2823,7 +2823,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) { long nVal = static_cast<long>(m_pKerningMF->GetValue()); nVal = LogicToLogic( nVal, MAP_POINT, MAP_TWIP ); @@ -2840,7 +2840,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); bool bHigh = m_pHighPosBtn->IsChecked(); @@ -2864,7 +2864,7 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi } -IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) { m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); } @@ -3374,7 +3374,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) } -IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) { bool bChecked = m_pTwoLinesBtn->IsChecked(); m_pEnclosingFrame->Enable( bChecked ); @@ -3383,7 +3383,7 @@ IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); if ( CHRDLG_ENCLOSE_SPECIAL_CHAR == reinterpret_cast<sal_uLong>(rBox.GetEntryData( nPos )) ) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index c92886723cb7..48680745fefd 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -396,11 +396,11 @@ VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow, return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs ); } -IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void ) +IMPL_LINK( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void ) { ChangeAttrHdl_Impl(&r); } -IMPL_LINK_TYPED( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void ) +IMPL_LINK( SvxConnectionPage, ChangeAttrEditHdl_Impl, Edit&, r, void ) { ChangeAttrHdl_Impl(&r); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e1b4a94cd43d..5c09f6b10d39 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -414,7 +414,7 @@ DeactivateRC SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet) description: scale changed, adjust size --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -443,7 +443,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, ZoomHdl, Edit&, rField, void ) description: change size, adjust scale --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -479,7 +479,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, SizeHdl, Edit&, rField, void ) description: evaluate border --------------------------------------------------------------------*/ -IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) +IMPL_LINK( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -563,7 +563,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropHdl, SpinField&, rField, void ) description: set original size --------------------------------------------------------------------*/ -IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, OrigSizeHdl, Button*, void) +IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl, Button*, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -724,7 +724,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) m_pZoomConstRB->Enable(bFound); } -IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) +IMPL_LINK_NOARG(SvxGrfCropPage, Timeout, Timer *, void) { DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(*pLastCropField); @@ -732,7 +732,7 @@ IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) } -IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) +IMPL_LINK( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); aTimer.Stop(); @@ -741,7 +741,7 @@ IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) } -IMPL_LINK_TYPED( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void ) +IMPL_LINK( SvxGrfCropPage, CropModifyHdl, Edit&, rField, void ) { aTimer.Start(); pLastCropField = static_cast<MetricField*>(&rField); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 3c2d3e9c0fdf..c325ff9d19a3 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -419,7 +419,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) } -IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ) { @@ -427,7 +427,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, vo } } -IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ_REL) { @@ -435,7 +435,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, } } -IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) +IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) { if (pButton == m_pCB_LAENGE) { @@ -453,7 +453,7 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) } -IMPL_LINK_NOARG_TYPED(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( (SdrCaptionType) m_pCT_CAPTTYPE->GetSelectItemId() ); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index b95b6a14fe7d..b980bc1f38cb 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -274,7 +274,7 @@ bool SfxMacroTabPage::IsReadOnly() const return mpImpl->bReadOnly; } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -290,7 +290,7 @@ IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) { mpImpl->pGroupLB->GroupSelected(); const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI(); @@ -302,17 +302,17 @@ IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) EnableButtons(); } -IMPL_LINK_NOARG_TYPED( SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG( SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) { EnableButtons(); } -IMPL_LINK_TYPED( SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) +IMPL_LINK( SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) { AssignDeleteHdl(pBtn); } -IMPL_LINK_TYPED( SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) +IMPL_LINK( SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) { return AssignDeleteHdl(pBtn); } @@ -363,7 +363,7 @@ bool SfxMacroTabPage::AssignDeleteHdl(Control* pBtn) return false; } -IMPL_LINK_TYPED( SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) +IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input SfxTabDialog* pTabDlg = GetTabDialog(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6da107c1c4ab..6fabe1fee2a1 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -612,7 +612,7 @@ void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ ) ChangeAttrHdl_Impl( pWindow ); } -IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) { if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) { @@ -659,15 +659,15 @@ IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) ChangeAttrHdl_Impl( p ); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void ) { ChangeAttrHdl_Impl(p); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrListBoxHdl_Impl, ListBox&, rBox, void ) { ChangeAttrHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxMeasurePage, ChangeAttrEditHdl_Impl, Edit&, rBox, void ) { ChangeAttrHdl_Impl(&rBox); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index e0f460a47a0c..cd726724aad8 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1195,7 +1195,7 @@ void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox() #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool ) +IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool ) { if (pLb == m_pLbFormat) { @@ -1229,15 +1229,15 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pL #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void ) { SelFormatHdl_Impl(pLb); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, pLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, pLb, void ) { SelFormatHdl_Impl(pLb); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, ListBox&, rLb, void ) +IMPL_LINK( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, ListBox&, rLb, void ) { SelFormatHdl_Impl(&rLb); } @@ -1361,7 +1361,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void) +IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void) { Click_Impl(static_cast<PushButton*>(pIB)); } @@ -1539,7 +1539,7 @@ bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumberFormatTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) { EditHdl_Impl(&rEdit); } @@ -1610,11 +1610,11 @@ void SvxNumberFormatTabPage::EditHdl_Impl( Edit* pEdFormat ) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void ) +IMPL_LINK( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void ) { OptHdl_Impl(pOptCtrl); } -IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumberFormatTabPage, OptEditHdl_Impl, Edit&, rEdit, void ) { OptHdl_Impl(&rEdit); } @@ -1669,7 +1669,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void* pOptCtrl ) } } -IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) { pLastActivWindow=nullptr; } @@ -1686,7 +1686,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) #* #************************************************************************/ -IMPL_LINK_TYPED( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) +IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) { Edit* pEd = static_cast<Edit*>(&rControl); if (pEd == m_pEdComment) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index b971d05839ca..04cabab006d1 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -320,7 +320,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -359,7 +359,7 @@ IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, voi } } -IMPL_LINK_NOARG_TYPED(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -484,7 +484,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -515,7 +515,7 @@ IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBulletPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -688,7 +688,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) } // all levels are changed here -IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -771,7 +771,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); @@ -944,7 +944,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) *pActNum = *pSaveNum; } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) { if(pActNum) { @@ -982,14 +982,14 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) { NumSelectHdl_Impl(m_pExamplesVS); PushButton& rOk = GetTabDialog()->GetOKButton(); rOk.GetClickHdl().Call(&rOk); } -IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0); @@ -1735,7 +1735,7 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, bool ) m_pOrientLB->Enable(bEnableBitmap); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -1776,12 +1776,12 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void) { m_pPreviewWIN->Invalidate(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) { for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { @@ -1800,7 +1800,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, AllLevelHdl_Impl, Edit&, rBox, void ) SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void ) { OUString sSelectStyle; bool bShowOrient = false; @@ -1892,7 +1892,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) m_pStartED->GetModifyHdl().Call(*m_pStartED); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); nPos ++; // no VERT_NONE @@ -1917,7 +1917,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) SetModified(false); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) { bool bSet = static_cast<CheckBox*>(pBox)->IsChecked(); pActNum->SetContinuousNumbering(bSet); @@ -1935,7 +1935,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) InitControls(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); Color nSetColor = pBox->GetSelectEntryColor(); @@ -1954,7 +1954,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulColorHdl_Impl, ListBox&, rListBox, voi SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) { sal_uInt16 nRelSize = (sal_uInt16)static_cast<MetricField&>(rField).GetValue(); @@ -1972,7 +1972,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, BulRelSizeHdl_Impl, Edit&, rField, void) SetModified(); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) { sal_uInt16 nItemId = pButton->GetCurItemId(); OUString aGrfName; @@ -2050,7 +2050,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, void) { if(!bMenuButtonInitialized) { @@ -2104,7 +2104,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, MenuButton *, } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) { VclPtrInstance< SvxCharacterMap > pMap( this, true ); @@ -2163,7 +2163,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) { bool bWidth = &rField == m_pWidthMF; bLastWidthModified = bWidth; @@ -2230,7 +2230,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, SizeHdl_Impl, Edit&, rField, void) SetModified(bRepaint); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) { if (static_cast<CheckBox*>(pBox)->IsChecked()) { @@ -2241,7 +2241,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) } } -IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) { bAutomaticCharStyles = false; sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); @@ -2266,11 +2266,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) SetModified(false); }; -IMPL_LINK_NOARG_TYPED( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxNumOptionsTabPage, EditListBoxHdl_Impl, ListBox&, void ) { EditModifyHdl_Impl(nullptr); } -IMPL_LINK_TYPED( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxNumOptionsTabPage, EditModifyHdl_Impl, Edit&, rEdit, void ) { EditModifyHdl_Impl(&rEdit); } @@ -3230,7 +3230,7 @@ void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) m_pIndentAtMF->SetUnit( eMetric ); } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -3255,7 +3255,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) { sal_uInt16 nSaveNumLvl = nActNumLvl; nActNumLvl = 0; @@ -3300,11 +3300,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, LevelHdl_Impl, ListBox&, rBox, void ) InitControls(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, DistanceFocusHdl_Impl, Control&, rControl, void ) { DistanceHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void ) { if(bInInintControl) return; @@ -3364,7 +3364,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceHdl_Impl, SpinField&, rFld, void } } -IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) { bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; @@ -3405,7 +3405,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) bLastRelative = bOn; } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) { // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; @@ -3462,11 +3462,11 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) { ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3487,11 +3487,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, vo SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) { AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3513,11 +3513,11 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void SetModified(); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) { IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); } -IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void ) +IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels const long nValue = GetCoreValue( static_cast<MetricField&>(rFld), eCoreUnit ); @@ -3542,7 +3542,7 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void SetModified(); } -IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void) { sal_uInt16 nMask = 1; SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index d025d5b8119a..b0940e4f85f7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -891,7 +891,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) { // switch inside outside const sal_uInt16 nPos = PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ); @@ -914,7 +914,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) { if ( m_pPaperTrayBox->GetEntryCount() > 1 ) // already filled @@ -946,7 +946,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) } -IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) { PaperSizeListBox& rListBox = static_cast<PaperSizeListBox&>( rBox ); Paper ePaper = rListBox.GetSelection(); @@ -1016,7 +1016,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich ); @@ -1029,7 +1029,7 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { if ( (!bLandscape && pBtn == m_pLandscapeBtn) || @@ -1123,7 +1123,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl, Edit&, void) { if ( !bBorderModified ) bBorderModified = true; @@ -1470,7 +1470,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl, Control&, void) { // example window long nHHeight = m_pBspWin->GetHdHeight(); @@ -1579,7 +1579,7 @@ void SvxPageDescPage::CalcMargin_Impl() } -IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl, Button*, void) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); m_pBspWin->SetVert( m_pVertBox->IsChecked() ); @@ -1601,7 +1601,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) } -IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) +IMPL_LINK( SvxPageDescPage, RegisterModify, Button*, pBox, void ) { bool bEnable = false; if(static_cast<CheckBox*>(pBox)->IsChecked()) @@ -1627,7 +1627,7 @@ void SvxPageDescPage::DisableVerticalPageDir() } } -IMPL_LINK_NOARG_TYPED( SvxPageDescPage, FrameDirectionModify_Impl, ListBox&, void) +IMPL_LINK_NOARG( SvxPageDescPage, FrameDirectionModify_Impl, ListBox&, void) { m_pBspWin->SetFrameDirection( (sal_uInt32) m_pTextFlowBox->GetSelectEntryValue() ); m_pBspWin->Invalidate(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index de32a1576703..1266cc67d36c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -161,7 +161,7 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) } -IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -781,7 +781,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl LineDistHdl_Impl( *m_pLineDist ); } -IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void ) +IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void ) { switch( rBox.GetSelectEntryPos() ) { @@ -848,7 +848,7 @@ IMPL_LINK_TYPED( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxStdParagraphTabPage, ModifyHdl_Impl, Edit&, void) { UpdateExample_Impl(); } @@ -925,7 +925,7 @@ void SvxStdParagraphTabPage::EnableContextualMode() m_pContextualCB->Show(); } -IMPL_LINK_TYPED( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void ) { bool bEnable = !static_cast<CheckBox*>(pBox)->IsChecked(); m_pFLineLabel->Enable(bEnable); @@ -1293,7 +1293,7 @@ void SvxParaAlignTabPage::ChangesApplied() m_pExpandCB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) { bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); @@ -1303,7 +1303,7 @@ IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) { //fdo#41350 only enable 'Expand last word' if last line is also justified bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; @@ -1311,7 +1311,7 @@ IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) UpdateExample_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl, ListBox&, void) { SvxFrameDirection eDir = m_pTextDirectionLB->GetSelectEntryValue(); switch ( eDir ) @@ -2000,7 +2000,7 @@ void SvxExtParagraphTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) { switch ( m_pPageBreakBox->GetState() ) { @@ -2041,14 +2041,14 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void) { bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE; m_pWidowBox->Enable(bEnable); m_pOrphanBox->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) { switch ( m_pWidowBox->GetState() ) { @@ -2070,7 +2070,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) { switch( m_pOrphanBox->GetState() ) { @@ -2092,7 +2092,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void) { bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE; @@ -2105,7 +2105,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void m_pHyphenBox->SetState( bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); } -IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pApplyCollBtn->GetState() == TRISTATE_TRUE && @@ -2126,7 +2126,7 @@ IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, v } } -IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void ) { if ( 0 == rListBox.GetSelectEntryPos() ) { @@ -2152,7 +2152,7 @@ IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBo } } -IMPL_LINK_TYPED( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void ) { //column break or break break after sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos(); @@ -2281,7 +2281,7 @@ void SvxAsianTabPage::ChangesApplied() m_pHangingPunctCB->SaveValue(); m_pScriptSpaceCB->SaveValue(); } -IMPL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void ) +IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void ) { static_cast<CheckBox*>(pBox)->EnableTriState( false ); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 7c03cf4a11b2..c11767a955a7 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1146,11 +1146,11 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) return nRet; } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) { RangeModifyHdl(*m_pWidthMF); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) { if(m_bPositioningDisabled) return; @@ -1228,7 +1228,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) m_pVertByMF->SetValue(m_pVertByMF->Normalize(aVal.nVPos), FUNIT_TWIP); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) { m_pHoriMirrorCB->Enable(!m_pAsCharRB->IsChecked() && !m_bIsMultiSelection); @@ -1248,13 +1248,13 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, MirrorHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl, Button*, void) { short nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) +IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriToLB; @@ -1283,7 +1283,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) RangeModifyHdl(*m_pWidthMF); } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) +IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) { bool bHori = &rLB == m_pHoriLB; ListBox *pRelLB = bHori ? m_pHoriToLB : m_pVertToLB; @@ -1385,7 +1385,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) } } -IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) { sal_Int64 nWidth = m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP)); sal_Int64 nHeight = m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP)); @@ -1406,7 +1406,7 @@ IMPL_LINK_TYPED( SvxSwPosSizeTabPage, ModifyHdl, Edit&, rEdit, void ) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) { m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && !m_pPositionCB->IsChecked()); } diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index a3813ae8df29..787fa7625282 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -247,7 +247,7 @@ short SvxAreaTabDialog::Ok() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void) +IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 6441aadfe019..b9efb53c7850 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -181,7 +181,7 @@ short SvxLineTabDialog::Ok() } -IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void) +IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 142c75b72b26..477ac3bce31a 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -461,7 +461,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pFillBtn->Check(); } -IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) { // Add a new one and select it // Get the value from the display @@ -516,7 +516,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength())); } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() ); @@ -556,7 +556,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) bCheck = true; } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) { if ( aNewTabs.Count() ) { @@ -568,7 +568,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void ) +IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; SvxTabAdjust eAdj; @@ -600,7 +600,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void ) +IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; sal_uInt8 cFill = ' '; @@ -628,7 +628,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, voi } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void ) { OUString aChar( static_cast<Edit&>(rControl).GetText() ); @@ -643,7 +643,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, v } } -IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void ) { OUString aChar( static_cast<Edit*>(&rControl)->GetText() ); if ( !aChar.isEmpty() && ( aChar[0] >= ' ')) @@ -657,7 +657,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, vo } } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) @@ -668,7 +668,7 @@ IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void) } } -IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl, Edit&, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index b2ffc914913a..2dcc3d39e7f4 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -480,7 +480,7 @@ VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow, return VclPtr<SvxTextAnimationPage>::Create( pWindow, *rAttrs ); } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -537,7 +537,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) { if( eAniKind != SDRTEXTANI_SLIDE ) @@ -556,7 +556,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) { TriState eState = m_pTsbAuto->GetState(); if( eState != TRISTATE_FALSE ) @@ -571,7 +571,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) { TriState eState = m_pTsbPixel->GetState(); if( eState == TRISTATE_TRUE ) @@ -608,7 +608,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void ) { m_pBtnUp->Check( pBtn == m_pBtnUp ); m_pBtnLeft->Check( pBtn == m_pBtnLeft ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index a53b3695b12f..3058bb9bbf5a 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -579,7 +579,7 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RectPoint eRP ) to be moved to a valid and adjacent position. This position depends on the current anchor position and the text writing direction. */ -IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) { if( m_pTsbFullWidth->GetState() == TRISTATE_TRUE ) { @@ -636,7 +636,7 @@ IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) |* \************************************************************************/ -IMPL_LINK_TYPED(SvxTextAttrPage, ClickHdl_Impl, Button*, pButton, void) +IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, Button*, pButton, void) { if (pButton == m_pTsbAutoGrowSize) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index e0caa7e3111e..a9022678b390 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -670,7 +670,7 @@ VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) { switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() ) { @@ -715,7 +715,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbColor->GetSelectEntryPos(); @@ -755,7 +755,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbGradient->GetSelectEntryPos(); @@ -800,7 +800,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() ModifyHatchingHdl_Impl( *m_pLbHatching ); } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) { // fill Hatch ItemSet const SfxPoolItem* pPoolItem = nullptr; @@ -855,7 +855,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; sal_Int32 _nPos = m_pLbBitmap->GetSelectEntryPos(); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2f37ff9c11f7..5265f34fbb12 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -498,7 +498,7 @@ void SvxBitmapTabPage::CalculateBitmapPresetSize() } } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -550,7 +550,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pBitmapLB->GetSelectItemId(); size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -593,7 +593,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) } } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pBitmapLB->GetSelectItemId(); size_t nPos = m_pBitmapLB->GetSelectItemPos(); @@ -616,7 +616,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) } } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) { if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectEntryPos()) != TILED ) { @@ -637,12 +637,12 @@ IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ClickScaleHdl, Button*, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, Button*, void ) { ModifyBitmapStyleHdl( *m_pBitmapStyleLB ); } -IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) { BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos(); bool bIsStretched( eStylePos == STRETCHED ); @@ -716,7 +716,7 @@ IMPL_LINK_NOARG_TYPED( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) { if(m_pPositionLB->IsEnabled()) m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectEntryPos() ) ) ); @@ -725,7 +725,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) { if(m_pPositionOffX->IsEnabled()) m_rXFSet.Put( XFillBmpPosOffsetXItem( m_pPositionOffX->GetValue() ) ); @@ -737,7 +737,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyPositionOffsetHdl, Edit&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) { sal_uInt16 nTileXOff = 0; sal_uInt16 nTileYOff = 0; @@ -755,7 +755,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) m_pCtlBitmapPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl, Button*, void) +IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) { ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg( OUString("Import") ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 870854f7c428..d0335f325bee 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -341,7 +341,7 @@ VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, } // is called when the content of the MtrFields is changed for color values -IMPL_LINK_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) { if (eCM == ColorModel::RGB) { @@ -374,7 +374,7 @@ IMPL_LINK_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, rEdit, void) } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) ); @@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) UpdateModified(); } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); @@ -465,7 +465,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_uInt16 nId = m_pValSetColorList->GetSelectItemId(); size_t nPos = m_pValSetColorList->GetSelectItemPos(); @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) { m_pValSetColorList->Clear(); sal_Int32 nPos = m_pSelectPalette->GetSelectEntryPos(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) m_pValSetColorList->Resize(); } -IMPL_LINK_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) +IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) { sal_Int32 nPos = pValSet->GetSelectItemId(); if( nPos != 0 ) @@ -579,7 +579,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) break; } } -IMPL_LINK_TYPED(SvxColorTabPage, SelectColorModeHdl_Impl, RadioButton&, rRadioButton, void) +IMPL_LINK(SvxColorTabPage, SelectColorModeHdl_Impl, RadioButton&, rRadioButton, void) { if( &rRadioButton == m_pRbRGB ) eCM = ColorModel::RGB; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 12cc67df15ad..11effdd86c9b 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -319,22 +319,22 @@ VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedEditHdl_Impl, Edit&, rBox, void ) { ModifiedHdl_Impl(&rBox); } -IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) +IMPL_LINK( SvxGradientTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) { ModifiedHdl_Impl(rSlider); } -IMPL_LINK_NOARG_TYPED( SvxGradientTabPage, ChangeAutoStepHdl_Impl, CheckBox&, void ) +IMPL_LINK_NOARG( SvxGradientTabPage, ChangeAutoStepHdl_Impl, CheckBox&, void ) { if(m_pCbIncrement->IsChecked()) { @@ -389,7 +389,7 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) ); @@ -466,7 +466,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -496,7 +496,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox* m_pBtnModify->Disable(); } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pGradientLB->GetSelectItemId(); size_t nPos = m_pGradientLB->GetSelectItemPos(); @@ -568,7 +568,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox* } } -IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl, ValueSet*, void) { ChangeGradientHdl_Impl(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index b9c9c384dcc5..6d8d4567c0ea 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -349,12 +349,12 @@ VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); } -IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBox&, void ) +IMPL_LINK_NOARG( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBox&, void ) { if(m_pCbBackgroundColor->IsChecked()) m_pLbBackgroundColor->Enable(); @@ -364,7 +364,7 @@ IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, CheckBo ModifiedBackgroundHdl_Impl(*m_pLbBackgroundColor); } -IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, void ) { Color aColor(COL_TRANSPARENT); if(m_pCbBackgroundColor->IsChecked()) @@ -379,12 +379,12 @@ IMPL_LINK_NOARG_TYPED( SvxHatchTabPage, ModifiedBackgroundHdl_Impl, ListBox&, vo m_pCtlPreview->Invalidate(); } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedEditHdl_Impl, Edit&, rEdit, void ) { ModifiedHdl_Impl(&rEdit); } -IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) +IMPL_LINK( SvxHatchTabPage, ModifiedSliderHdl_Impl, Slider*, rSlider, void ) { ModifiedHdl_Impl(rSlider); } @@ -407,7 +407,7 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void* p ) m_pCtlPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl, ValueSet*, void) { ChangeHatchHdl_Impl(); } @@ -471,7 +471,7 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl() m_pHatchLB->SaveValue(); } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) ); @@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); @@ -572,7 +572,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); @@ -598,7 +598,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, v } } -IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) +IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) { sal_uInt16 nId = m_pHatchLB->GetSelectItemId(); size_t nPos = m_pHatchLB->GetSelectItemPos(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index afd5858c9028..6b5ade69f9eb 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1511,11 +1511,11 @@ VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangePreviewHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangePreviewModifyHdl_Impl, Edit&, rEdit, void ) { ChangePreviewHdl_Impl(&rEdit); } @@ -1579,15 +1579,15 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl ) } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) { ChangeStartHdl_Impl(p); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangeStartHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangeStartModifyHdl_Impl, Edit&, rEdit, void ) { ChangeStartHdl_Impl(&rEdit); } @@ -1607,7 +1607,7 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void * p ) } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) { ChangePreviewHdl_Impl( nullptr ); } @@ -1615,13 +1615,13 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) // fdo#43209 -IMPL_LINK_NOARG_TYPED( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void ) +IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void ) { ChangePreviewHdl_Impl( nullptr ); } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) { if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible { @@ -1654,15 +1654,15 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) { ChangeEndHdl_Impl(p); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndListBoxHdl_Impl, ListBox&, rListBox, void ) { ChangeEndHdl_Impl(&rListBox); } -IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void ) +IMPL_LINK( SvxLineTabPage, ChangeEndModifyHdl_Impl, Edit&, rEdit, void ) { ChangeEndHdl_Impl(&rEdit); } @@ -1682,7 +1682,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) } -IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) { sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); @@ -1713,19 +1713,19 @@ void SvxLineTabPage::FillUserData() // #58425# Symbols on a list (e.g. StarChart) // Handler for the symbol selection's popup menu (NumMenueButton) // The following link originates from SvxNumOptionsTabPage -IMPL_LINK_TYPED( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton, void ) { InitSymbols(pButton); } // #58425# Symbols on a list (e.g. StarChart) // Handler for menu button -IMPL_LINK_TYPED( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) +IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) { SymbolSelected(pButton); } -IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) +IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) { m_bNewSize = true; bool bWidth = &rField == m_pSymbolWidthMF; @@ -1771,7 +1771,7 @@ IMPL_LINK_TYPED( SvxLineTabPage, SizeHdl_Impl, Edit&, rField, void) m_pCtlPreview->ResizeSymbol(m_aSymbolSize); m_aSymbolLastSize=m_aSymbolSize; } -IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) +IMPL_LINK( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) { if (static_cast<CheckBox*>(pBox)->IsChecked()) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 0620d442ab5e..f9949a33ae84 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -349,7 +349,7 @@ VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxIte } -IMPL_LINK_TYPED( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectLinestyleHdl_Impl(&rListBox); } @@ -386,13 +386,13 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) { FillDash_Impl(); m_pCtlPreview->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) { if( m_pNumFldNumber1->GetValue() == 0L ) { @@ -409,7 +409,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) { if( m_pNumFldNumber2->GetValue() == 0L ) { @@ -426,7 +426,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) } -IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) +IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) { if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit ) { @@ -493,7 +493,7 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) } -IMPL_LINK_TYPED( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) +IMPL_LINK( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectTypeHdl_Impl(&rListBox); } @@ -531,7 +531,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) ); @@ -613,7 +613,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -679,7 +679,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -714,7 +714,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -794,7 +794,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); OUString aStrFilterType( "*.sod" ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 6412f7ba8e64..aa0067b63020 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -280,7 +280,7 @@ VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const Sfx } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) { if( pLineEndList->Count() > 0 ) { @@ -311,7 +311,7 @@ void SvxLineEndDefTabPage::ChangePreviewHdl_Impl() } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -389,7 +389,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { if( pPolyObj ) { @@ -497,7 +497,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -531,7 +531,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -612,7 +612,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); OUString aStrFilterType( "*.soe" ); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index de13c2089745..0342d1eeaabd 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -314,7 +314,7 @@ VclPtr<SfxTabPage> SvxPatternTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) { std::unique_ptr<GraphicObject> pGraphicObject; size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -420,7 +420,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_PATTERN_UNTITLED ) ); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) /******************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) { sal_uInt16 nId = m_pPatternLB->GetSelectItemId(); size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -551,7 +551,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) { size_t nPos = m_pPatternLB->GetSelectItemPos(); sal_Int32 nId = m_pPatternLB->GetSelectItemId(); @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) { sal_uInt16 nId = m_pPatternLB->GetSelectItemId(); size_t nPos = m_pPatternLB->GetSelectItemPos(); @@ -641,7 +641,7 @@ IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, } } -IMPL_LINK_NOARG_TYPED(SvxPatternTabPage, ChangeColorHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxPatternTabPage, ChangeColorHdl_Impl, ListBox&, void) { ChangeColor_Impl(); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 4073e715fe33..d2b1dca3ce28 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -473,7 +473,7 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE ) { @@ -489,11 +489,11 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) { ModifyShadowHdl_Impl(*m_pMtrTransparent); } -IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_TRUE ) m_rXFSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index cc718cc949a8..1c62d1b60d7a 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -62,7 +62,7 @@ const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] = |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void) { // disable all other controls ActivateLinear(false); @@ -77,7 +77,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, vo InvalidatePreview( false ); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void) { // enable linear, disable other ActivateLinear(true); @@ -88,7 +88,7 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, ModifyTransparentHdl_Impl (*m_pMtrTransparent); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) { // enable gradient, disable other ActivateLinear(false); @@ -131,7 +131,7 @@ void SvxTransparenceTabPage::ActivateLinear(bool bActivate) m_pMtrTransparent->Enable(bActivate); } -IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, void) { sal_uInt16 nPos = (sal_uInt16)m_pMtrTransparent->GetValue(); XFillTransparenceItem aItem(nPos); @@ -141,12 +141,12 @@ IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ModifyTransparentHdl_Impl, Edit&, InvalidatePreview(); } -IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void) +IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrListBoxHdl_Impl, ListBox&, rListBox, void) { ModifiedTrgrHdl_Impl(&rListBox); } -IMPL_LINK_TYPED(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void) +IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrEditHdl_Impl, Edit&, rBox, void) { ModifiedTrgrHdl_Impl(&rBox); } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 5944f58eb4ab..d673aa64725a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1178,7 +1178,7 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) { // #106572# Remember user's last choice m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState ); @@ -1219,7 +1219,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) { if( m_pTsbSizeProtect->IsEnabled() ) { @@ -1547,7 +1547,7 @@ void SvxPositionSizeTabPage::DisableProtect() } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1569,7 +1569,7 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) { @@ -1591,13 +1591,13 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) { UpdateControlStates(); } -IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) { if( m_pCbxScale->IsChecked() ) { |