diff options
Diffstat (limited to 'cui/source/options')
47 files changed, 241 insertions, 241 deletions
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(); |