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 /include | |
| 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 'include')
156 files changed, 418 insertions, 418 deletions
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index 8adefd1d45dc..1f19469c8504 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -58,7 +58,7 @@ namespace dbaui void CancelCall(); protected: - DECL_LINK_TYPED(OnAsyncCall, void*, void); + DECL_LINK(OnAsyncCall, void*, void); }; } #endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx index 7386bf35cbc3..82f97a1c665d 100644 --- a/include/dbaccess/ToolBoxHelper.hxx +++ b/include/dbaccess/ToolBoxHelper.hxx @@ -69,8 +69,8 @@ namespace dbaui void checkImageList(); protected: - DECL_LINK_TYPED(ConfigOptionsChanged, LinkParamNone*, void); - DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void ); + DECL_LINK(ConfigOptionsChanged, LinkParamNone*, void); + DECL_LINK(SettingsChanged, VclSimpleEvent&, void ); }; } #endif // INCLUDED_DBACCESS_TOOLBOXHELPER_HXX diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 40b9086a144d..0b1501d6a99c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -422,8 +422,8 @@ namespace dbaui void ImplBroadcastFeatureState(const OUString& _rFeature, const css::uno::Reference< css::frame::XStatusListener > & xListener, bool _bIgnoreCache); // link methods - DECL_LINK_TYPED(OnAsyncInvalidateAll, void*, void); - DECL_LINK_TYPED(OnAsyncCloseTask, void*, void); + DECL_LINK(OnAsyncInvalidateAll, void*, void); + DECL_LINK(OnAsyncCloseTask, void*, void); public: const css::uno::Reference< css::uno::XComponentContext >& getORB() const { return m_xContext; } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 5cdf08dfcd43..7290b66ded3a 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -627,12 +627,12 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool bStrippingPortions; bool bPasting; - DECL_LINK_TYPED( ParaVisibleStateChangedHdl, Paragraph&, void ); - DECL_LINK_TYPED( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK_TYPED( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); - DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos&, void ); - DECL_LINK_TYPED( EditEngineNotifyHdl, EENotify&, void ); + DECL_LINK( ParaVisibleStateChangedHdl, Paragraph&, void ); + DECL_LINK( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_LINK( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); + DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos&, void ); + DECL_LINK( EditEngineNotifyHdl, EENotify&, void ); void ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd ); bool ImplHasNumberFormat( sal_Int32 nPara ) const; Size ImplGetBulletSize( sal_Int32 nPara ); diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 923c60fe9390..c0a12a3e0edd 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -107,7 +107,7 @@ public: private: ::std::unique_ptr<FormulaDlg_Impl> m_pImpl; - DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Idle*, void ); protected: void disableOk(); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 04f919c46c6e..d5d3c00fc8dd 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -48,7 +48,7 @@ private: IControlReferenceHandler* pAnyRefDlg; // parent dialog VclPtr<vcl::Window> pLabelWidget; - DECL_LINK_TYPED( UpdateHdl, Idle*, void ); + DECL_LINK( UpdateHdl, Idle*, void ); protected: virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 7117b6c0bb3c..67df6f296dbd 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -118,7 +118,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell { std::unique_ptr<SfxAppData_Impl> pImpl; - DECL_DLLPRIVATE_LINK_TYPED( GlobalBasicErrorHdl_Impl, StarBASIC*, bool ); + DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC*, bool ); void Deinitialize(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index afbf05596a38..04f642c9c872 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -106,7 +106,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); }; @@ -146,7 +146,7 @@ public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); }; @@ -186,7 +186,7 @@ protected: VclPtr<CancelButton> pCancelBtn; VclPtr<HelpButton> pHelpBtn; - DECL_DLLPRIVATE_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_DLLPRIVATE_LINK(OKHdl_Impl, Button*, void); private: std::unique_ptr<SingleTabDlgImpl> pImpl; diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index f3e5537a7d49..9597f5428a5d 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -132,7 +132,7 @@ private: const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); - DECL_DLLPRIVATE_LINK_TYPED( NextJob, Timer *, void ); + DECL_DLLPRIVATE_LINK( NextJob, Timer *, void ); SAL_DLLPRIVATE bool NextJob_Impl(Timer * pTimer); public: diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index 140c4700fdb7..77a8085b3f11 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -21,7 +21,7 @@ class SfxCheckinDialog : public ModalDialog VclPtr<OKButton> m_pOKBtn; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SfxCheckinDialog( vcl::Window* pParent ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index bb177ccc5f93..e4a74d7a0caa 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -209,9 +209,9 @@ private: bool bEnableUseUserData : 1, bHandleDelete : 1; - DECL_LINK_TYPED(DeleteHdl, Button*, void); - DECL_LINK_TYPED(SignatureHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); + DECL_LINK(SignatureHdl, Button*, void); + DECL_STATIC_LINK(SfxDocumentPage, ChangePassHdl, Button*, void); void ImplUpdateSignatures(); void ImplCheckPasswordState(); @@ -340,7 +340,7 @@ class CustomPropertiesEditButton : public PushButton public: CustomPropertiesEditButton(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine); - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); }; class CustomPropertiesRemoveButton : public ImageButton @@ -427,14 +427,14 @@ private: Idle m_aBoxLoseFocusIdle; Link<void*,void> m_aRemovedHdl; - DECL_STATIC_LINK_TYPED( CustomPropertiesWindow, TypeHdl, ListBox&, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( EditLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( BoxLoseFocusHdl, Control&, void ); + DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, ListBox&, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( EditLoseFocusHdl, Control&, void ); + DECL_LINK( BoxLoseFocusHdl, Control&, void ); //add lose focus handlers of Date/TimeField? - DECL_LINK_TYPED(EditTimeoutHdl, Idle *, void); - DECL_LINK_TYPED(BoxTimeoutHdl, Idle *, void); + DECL_LINK(EditTimeoutHdl, Idle *, void); + DECL_LINK(BoxTimeoutHdl, Idle *, void); bool IsLineValid( CustomPropertyLine* pLine ) const; void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); @@ -475,8 +475,8 @@ private: sal_Int32 m_nThumbPos; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( RemovedHdl, void*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( RemovedHdl, void*, void ); public: CustomPropertiesControl(vcl::Window* pParent); @@ -501,7 +501,7 @@ class SfxCustomPropertiesPage : public SfxTabPage private: VclPtr<CustomPropertiesControl> m_pPropertiesCtrl; - DECL_LINK_TYPED(AddHdl, Button*, void); + DECL_LINK(AddHdl, Button*, void); using TabPage::DeactivatePage; @@ -598,7 +598,7 @@ private: CmisPropertiesWindow m_pPropertiesWin; VclScrolledWindow& m_rScrolledWindow; ScrollBar& m_rVertScroll; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); void checkAutoVScroll(); diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 416f003b1a49..8d88ce0b3946 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -87,8 +87,8 @@ private: friend class SfxApplication; friend class SfxViewFrame; - DECL_DLLPRIVATE_LINK_TYPED( EventHdl_Impl, Idle *, void ); - DECL_DLLPRIVATE_LINK_TYPED( PostMsgHandler, SfxRequest *, void ); + DECL_DLLPRIVATE_LINK( EventHdl_Impl, Idle *, void ); + DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest *, void ); SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord ); SAL_DLLPRIVATE void Update_Impl_( bool,bool,bool,SfxWorkWindow*); diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 736577627a60..5d6ea0a40eef 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -49,7 +49,7 @@ private: SfxItemSet* m_pItemSet; std::vector<OUString> m_pURLList; - DECL_LINK_TYPED(DialogClosedHdl, sfx2::FileDialogHelper*, void); + DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); public: DocumentInserter(const OUString& rFactory, diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index b9f2e974ce32..03201c79dca0 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -99,7 +99,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) override; - DECL_LINK_TYPED(TimerHdl, Idle *, void); + DECL_LINK(TimerHdl, Idle *, void); SAL_DLLPRIVATE void Initialize_Impl(); SAL_DLLPRIVATE SplitWindowItemFlags GetWinBits_Impl() const; diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx index e3271e4ae2ea..67835cd703d4 100644 --- a/include/sfx2/emojicontrol.hxx +++ b/include/sfx2/emojicontrol.hxx @@ -37,8 +37,8 @@ private: /// Return filter according to the currently selected tab page. FILTER_CATEGORY getCurrentFilter(); - DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void); - DECL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void); + DECL_LINK(ActivatePageHdl, TabControl*, void); + DECL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void); VclPtr<TabControl> mpTabControl; VclPtr<EmojiView> mpEmojiView; diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index aded0de15b47..ed7055923188 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -81,7 +81,7 @@ public: SfxFilterMatcher& operator=( const SfxFilterMatcher& ) = delete; SAL_DLLPRIVATE static bool IsFilterInstalled_Impl( const std::shared_ptr<const SfxFilter>& pFilter ); - DECL_DLLPRIVATE_LINK_TYPED( MaybeFileHdl_Impl, OUString*, bool ); + DECL_DLLPRIVATE_LINK( MaybeFileHdl_Impl, OUString*, bool ); sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& ) const; sal_uInt32 GuessFilter( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& , SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index c443638b619b..0c6ac8c10d42 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -223,7 +223,7 @@ public: */ void SetContext( Context _eNewContext ); - DECL_LINK_TYPED( ExecuteSystemFilePicker, void*, void ); + DECL_LINK( ExecuteSystemFilePicker, void*, void ); ErrCode Execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index 63d6a17db7d2..fae4be363dd7 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -41,7 +41,7 @@ class SfxHintPoster : public SvRefBase private: Link<SfxRequest*,void> m_Link; - DECL_LINK_TYPED( DoEvent_Impl, void*, void ); + DECL_LINK( DoEvent_Impl, void*, void ); protected: virtual ~SfxHintPoster() override; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 96359a1205fd..2d732bdb7526 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -70,7 +70,7 @@ class SfxInfoBarWindow : public vcl::Window void addButton(PushButton* pButton); private: - DECL_LINK_TYPED( CloseHandler, Button*, void ); + DECL_LINK( CloseHandler, Button*, void ); }; class SfxInfoBarContainerWindow : public vcl::Window diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx index 11af70168f37..69cee70da20b 100644 --- a/include/sfx2/inputdlg.hxx +++ b/include/sfx2/inputdlg.hxx @@ -30,7 +30,7 @@ public: private: - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); private: diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index f8e210ce3228..ad5c7c3eebd8 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -79,7 +79,7 @@ private: bool bUseCache : 1; // for Graphics Links! bool bWasLastEditOK : 1; - DECL_LINK_TYPED( EndEditHdl, const OUString&, void ); + DECL_LINK( EndEditHdl, const OUString&, void ); bool ExecuteEdit( const OUString& _rNewName ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index f5bc75e6afaa..637f928d867e 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -69,12 +69,12 @@ class SfxManageStyleSheetPage : public SfxTabPage private: friend class SfxStyleDialog; - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( EditStyleSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditStyleHdl_Impl, Button*, void ); - DECL_LINK_TYPED( EditLinkStyleSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditLinkStyleHdl_Impl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( EditStyleSelectHdl_Impl, ListBox&, void ); + DECL_LINK( EditStyleHdl_Impl, Button*, void ); + DECL_LINK( EditLinkStyleSelectHdl_Impl, ListBox&, void ); + DECL_LINK( EditLinkStyleHdl_Impl, Button*, void ); void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 142f707c7e34..bbafa704f76b 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -39,9 +39,9 @@ private: VclPtr<MessageDialog> aQueryOverwriteBox; SfxStyleSheetBasePool& rPool; - DECL_DLLPRIVATE_LINK_TYPED( OKHdl, ComboBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( OKClickHdl, Button *, void ); - DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_DLLPRIVATE_LINK( OKHdl, ComboBox&, void ); + DECL_DLLPRIVATE_LINK( OKClickHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( ModifyHdl, Edit&, void ); public: SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx index de831ed45000..471e806d96c3 100644 --- a/include/sfx2/notebookbar/SfxNotebookBar.hxx +++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx @@ -45,7 +45,7 @@ public: private: static bool m_bLock; - DECL_STATIC_LINK_TYPED(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, void); + DECL_STATIC_LINK(SfxNotebookBar, OpenNotebookbarPopupMenu, NotebookBar*, void); }; } // namespace sfx2 diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 128a51a5fdfe..0a256e727c99 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -76,8 +76,8 @@ private: SfxShowExtras mnExtras; bool mbAsciiOnly; - DECL_DLLPRIVATE_LINK_TYPED(EditModifyHdl, Edit&, void); - DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button *, void); + DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit&, void); + DECL_DLLPRIVATE_LINK(OKHdl, Button *, void); void ModifyHdl(Edit*); void SetPasswdText(); diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 4d7f96de878e..82a94ed22747 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -70,15 +70,15 @@ private: PrinterOptions maPrinterOptions; PrinterOptions maPrintFileOptions; - DECL_DLLPRIVATE_LINK_TYPED( ToggleOutputPrinterRBHdl, RadioButton&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleOutputPrintFileRBHdl, RadioButton&, void); + DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl, RadioButton&, void); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceTransparencyCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceGradientsCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ClickReduceBitmapsCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleReduceGradientsStripesRBHdl, RadioButton&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceGradientsStripesRBHdl, RadioButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceBitmapsResolutionRBHdl, RadioButton&, void ); SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions ); SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions ); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index af3ce1badb80..76c7647c4931 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -58,7 +58,7 @@ public: /// Update the information in the view. virtual void Reload() override; - DECL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, void*, void ); protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/include/sfx2/saveastemplatedlg.hxx b/include/sfx2/saveastemplatedlg.hxx index d08abf31a931..212e4578b5af 100644 --- a/include/sfx2/saveastemplatedlg.hxx +++ b/include/sfx2/saveastemplatedlg.hxx @@ -43,9 +43,9 @@ private: css::uno::Reference< css::frame::XModel > m_xModel; public: - DECL_LINK_TYPED(OkClickHdl, Button*, void); - DECL_LINK_TYPED(TemplateNameEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectCategoryHdl, ListBox&, void); + DECL_LINK(OkClickHdl, Button*, void); + DECL_LINK(TemplateNameEditHdl, Edit&, void); + DECL_LINK(SelectCategoryHdl, ListBox&, void); void setDocumentModel (const css::uno::Reference<css::frame::XModel> &rModel); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index c87f563380fb..af32849a9e9a 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -194,7 +194,7 @@ private: SAL_DLLPRIVATE SfxViewFrame& GetViewFrame_Impl() const; SAL_DLLPRIVATE void ShowInfoBars( ); - DECL_LINK_TYPED( CheckOutHandler, Button*, void ); + DECL_LINK( CheckOutHandler, Button*, void ); IMPL_SfxBaseController_DataContainer* m_pData ; diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx index 02186de0c6ba..5e7d06b0a344 100644 --- a/include/sfx2/sidebar/AsynchronousCall.hxx +++ b/include/sfx2/sidebar/AsynchronousCall.hxx @@ -46,7 +46,7 @@ private: Action maAction; ImplSVEvent * mnCallId; - DECL_LINK_TYPED(HandleUserCall, void*, void); + DECL_LINK(HandleUserCall, void*, void); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index 299e25641e30..8eb06e5b0b9c 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -91,7 +91,7 @@ private: VclPtr<vcl::Window> mpFiller; VclPtr<ScrollBar> mpVerticalScrollBar; - DECL_LINK_TYPED(HandleVerticalScrollBarChange, ScrollBar*, void); + DECL_LINK(HandleVerticalScrollBarChange, ScrollBar*, void); bool ProcessWheelEvent(CommandEvent* pCommandEvent); }; diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx index 71096cbaa78b..a488852ee21e 100644 --- a/include/sfx2/sidebar/FocusManager.hxx +++ b/include/sfx2/sidebar/FocusManager.hxx @@ -96,8 +96,8 @@ private: /** Listen for key events for panels and buttons. */ - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void); - DECL_LINK_TYPED(ChildEventListener, VclWindowEvent&, void); + DECL_LINK( WindowEventListener, VclWindowEvent&, void); + DECL_LINK(ChildEventListener, VclWindowEvent&, void); void ClearPanels(); void ClearButtons(); diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index 6b64fdefe750..d4cdd574191d 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -211,7 +211,7 @@ private: */ VclPtr<vcl::Window> mpCloseIndicator; - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); /** Make maRequestedContext the current context. */ void UpdateConfigurations(); @@ -241,7 +241,7 @@ private: const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; VclPtr<PopupMenu> CreatePopupMenu ( const ::std::vector<TabBar::DeckMenuData>& rMenuData) const; - DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool); + DECL_LINK(OnMenuItemSelected, Menu*, bool); void BroadcastPropertyChange(); /** The close of the deck changes the width of the child window. diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 85290a1b3c5b..dfe4eaf085e4 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -64,11 +64,11 @@ protected: ControllerContainer maControllers; bool mbAreHandlersRegistered; - DECL_LINK_TYPED(DropDownClickHandler, ToolBox*, void); - DECL_LINK_TYPED(ClickHandler, ToolBox*, void); - DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void); - DECL_LINK_TYPED(SelectHandler, ToolBox*, void); - DECL_LINK_TYPED(ChangedIconSizeHandler, LinkParamNone*, void ); + DECL_LINK(DropDownClickHandler, ToolBox*, void); + DECL_LINK(ClickHandler, ToolBox*, void); + DECL_LINK(DoubleClickHandler, ToolBox*, void); + DECL_LINK(SelectHandler, ToolBox*, void); + DECL_LINK(ChangedIconSizeHandler, LinkParamNone*, void ); css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index e8982460c75a..5ea6a946e17b 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -97,7 +97,7 @@ private: class Item { public: - DECL_LINK_TYPED(HandleClick, Button*, void); + DECL_LINK(HandleClick, Button*, void); VclPtr<RadioButton> mpButton; OUString msDeckId; ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor; @@ -115,7 +115,7 @@ private: void Layout(); void UpdateButtonIcons(); - DECL_LINK_TYPED(OnToolboxClicked, Button*, void); + DECL_LINK(OnToolboxClicked, Button*, void); SidebarController* pParentSidebarController; diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 612172e8e881..2a554317fb39 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -70,7 +70,7 @@ private: sidebar::Paint maBackgroundPaint; void PaintTitle(vcl::RenderContext& rRenderContext, const Rectangle& rTitleBox); - DECL_LINK_TYPED(SelectionHandler, ToolBox*, void); + DECL_LINK(SelectionHandler, ToolBox*, void); }; } } // end of namespace sfx2::sidebar diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 50756c0f2783..5abf6c653d22 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -31,7 +31,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog { private: SfxStyleSheetBase* pStyle; - DECL_DLLPRIVATE_LINK_TYPED( CancelHdl, Button *, void ); + DECL_DLLPRIVATE_LINK( CancelHdl, Button *, void ); sal_uInt16 m_nOrganizerId; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 663310f3cb7f..811a140928df 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -88,13 +88,13 @@ friend class SfxTabDialogUIObject; bool m_bItemsReset; bool m_bStandardPushed; - DECL_DLLPRIVATE_LINK_TYPED(ActivatePageHdl, TabControl*, void ); - DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl*, bool ); - DECL_DLLPRIVATE_LINK_TYPED(OkHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(ResetHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(BaseFmtHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(UserHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(CancelHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, TabControl*, void ); + DECL_DLLPRIVATE_LINK(DeactivatePageHdl, TabControl*, bool ); + DECL_DLLPRIVATE_LINK(OkHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ResetHdl, Button*, void); + DECL_DLLPRIVATE_LINK(BaseFmtHdl, Button*, void); + DECL_DLLPRIVATE_LINK(UserHdl, Button*, void); + DECL_DLLPRIVATE_LINK(CancelHdl, Button*, void); SAL_DLLPRIVATE void Init_Impl(bool bFmtFlag); protected: diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 3a9d101549ba..60536f5d0c26 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -154,8 +154,8 @@ friend struct SfxTbxCtrlFactory; std::unique_ptr< SfxToolBoxControl_Impl> pImpl; protected: - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( ClosePopupWindow, SfxPopupWindow *, void ); // old SfxToolBoxControl methods virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/include/sfx2/templatedefaultview.hxx b/include/sfx2/templatedefaultview.hxx index 68584eafa3a7..c29c2c9b4ea4 100644 --- a/include/sfx2/templatedefaultview.hxx +++ b/include/sfx2/templatedefaultview.hxx @@ -25,7 +25,7 @@ public: void createContextMenu(); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, void); + DECL_LINK(ContextMenuSelectHdl, Menu*, void); protected: long mnItemMaxSize; long mnTextHeight; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 3054b22c532e..b1406f1b8a07 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -62,31 +62,31 @@ protected: void fillFolderComboBox(); - DECL_LINK_TYPED(TBXDropdownHdl, ToolBox*, void); + DECL_LINK(TBXDropdownHdl, ToolBox*, void); - DECL_LINK_TYPED(SelectApplicationHdl, ListBox&, void); - DECL_LINK_TYPED(SelectRegionHdl, ListBox&, void); + DECL_LINK(SelectApplicationHdl, ListBox&, void); + DECL_LINK(SelectRegionHdl, ListBox&, void); - DECL_LINK_TYPED(OkClickHdl, Button*, void); - DECL_LINK_TYPED(MoveClickHdl, Button*, void); - DECL_LINK_TYPED(ExportClickHdl, Button*, void); - DECL_LINK_TYPED(ImportClickHdl, Button*, void); - DECL_STATIC_LINK_TYPED(SfxTemplateManagerDlg, LinkClickHdl, Button*, void); + DECL_LINK(OkClickHdl, Button*, void); + DECL_LINK(MoveClickHdl, Button*, void); + DECL_LINK(ExportClickHdl, Button*, void); + DECL_LINK(ImportClickHdl, Button*, void); + DECL_STATIC_LINK(SfxTemplateManagerDlg, LinkClickHdl, Button*, void); - DECL_LINK_TYPED(TVItemStateHdl, const ThumbnailViewItem*, void); + DECL_LINK(TVItemStateHdl, const ThumbnailViewItem*, void); - DECL_LINK_TYPED(MenuSelectHdl, Menu*, bool); - DECL_LINK_TYPED(DefaultTemplateMenuSelectHdl, Menu*, bool); + DECL_LINK(MenuSelectHdl, Menu*, bool); + DECL_LINK(DefaultTemplateMenuSelectHdl, Menu*, bool); - DECL_LINK_TYPED(OpenRegionHdl, void*, void); - DECL_LINK_TYPED(CreateContextMenuHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(EditTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(DeleteTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(DefaultTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenRegionHdl, void*, void); + DECL_LINK(CreateContextMenuHdl, ThumbnailViewItem*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(EditTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(DeleteTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(DefaultTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void); - DECL_LINK_TYPED(GetFocusHdl, Control&, void); + DECL_LINK(SearchUpdateHdl, Edit&, void); + DECL_LINK(GetFocusHdl, Control&, void); void OnTemplateImportCategory(const OUString& sCategory); static void OnTemplateLink (); @@ -159,8 +159,8 @@ private: bool mbIsNewCategory; public: - DECL_LINK_TYPED(NewCategoryEditHdl, Edit&, void); - DECL_LINK_TYPED(SelectCategoryHdl, ListBox&, void); + DECL_LINK(NewCategoryEditHdl, Edit&, void); + DECL_LINK(SelectCategoryHdl, ListBox&, void); void SetCategoryLBEntries(std::vector<OUString> names); @@ -202,8 +202,8 @@ public: inline bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; private: - DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK_TYPED(OkClickHdl, Button*, void); + DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); + DECL_LINK(OkClickHdl, Button*, void); OUString msTemplatePath; }; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 45e31a7973a6..f4e31efdf76d 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -99,7 +99,7 @@ public: void createContextMenu(const bool bIsDefault ); - DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool); + DECL_LINK(ContextMenuSelectHdl, Menu*, bool); TemplateContainerItem* getRegion(OUString const & sStr); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index f761a3780b00..81cab2da57dc 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -289,7 +289,7 @@ protected: SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos ); SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ); SFX2_DLLPRIVATE bool ImplHasAccessibleListeners(); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar*, void ); protected: diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 2a4541b480b9..1ecf42f61d81 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -79,7 +79,7 @@ namespace sfx2 OUString impl_getTitle() const; private: - DECL_LINK_TYPED( OnToolboxItemSelected, ToolBox*, void ); + DECL_LINK( OnToolboxItemSelected, ToolBox*, void ); void impl_construct(); void impl_layout(); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 90d49a84964a..ec4e931c71b4 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -77,7 +77,7 @@ private: protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( SwitchReadOnlyHandler, Button*, void ); + DECL_LINK( SwitchReadOnlyHandler, Button*, void ); SAL_DLLPRIVATE void KillDispatcher_Impl(); virtual ~SfxViewFrame() override; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 25545f759c8e..9611eb6c4f3d 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -893,7 +893,7 @@ private: sal_uInt16 nPos, const OUString& rSymbol ); // link to be set at <method>SvtSysLocaleOptions::SetCurrencyChangeLink()</method> - DECL_DLLPRIVATE_STATIC_LINK_TYPED( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ); + DECL_DLLPRIVATE_STATIC_LINK( SvNumberFormatter, CurrencyChangeLink, LinkParamNone*, void ); // return position of a special character sal_Int32 ImpPosToken ( const OUStringBuffer & sFormat, sal_Unicode token, sal_Int32 nStartPos = 0 ); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 41090dd68e21..5524b96d4db3 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -56,9 +56,9 @@ private: double getViewWidthInch(); double getViewHeightInch(); - DECL_LINK_TYPED( widthModifiedHandle, Edit&, void ); - DECL_LINK_TYPED( heightModifiedHandle, Edit&, void ); - DECL_LINK_TYPED( resolutionModifiedHandle, Edit&, void ); + DECL_LINK( widthModifiedHandle, Edit&, void ); + DECL_LINK( heightModifiedHandle, Edit&, void ); + DECL_LINK( resolutionModifiedHandle, Edit&, void ); public: GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 975789971dee..c6ab42b05f83 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -83,13 +83,13 @@ private: void InitDetails( ); void UpdateLabel( ); - DECL_LINK_TYPED ( OKHdl, Button *, void ); - DECL_LINK_TYPED ( DelHdl, Button *, void ); - DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void ); - DECL_LINK_TYPED ( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED ( SelectTypeHdl, ListBox&, void ); - DECL_LINK_TYPED ( EditLabelHdl, Edit&, void ); - DECL_LINK_TYPED ( EditUsernameHdl, Edit&, void ); + DECL_LINK ( OKHdl, Button *, void ); + DECL_LINK ( DelHdl, Button *, void ); + DECL_LINK ( EditHdl, DetailsContainer*, void ); + DECL_LINK ( ModifyHdl, Edit&, void ); + DECL_LINK ( SelectTypeHdl, ListBox&, void ); + DECL_LINK ( EditLabelHdl, Edit&, void ); + DECL_LINK ( EditUsernameHdl, Edit&, void ); }; diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index a0a20157d2c9..4631c99210dc 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -61,7 +61,7 @@ class DetailsContainer protected: void notifyChange( ); - DECL_LINK_TYPED ( ValueChangeHdl, Edit&, void ); + DECL_LINK ( ValueChangeHdl, Edit&, void ); }; class HostDetailsContainer : public DetailsContainer @@ -104,7 +104,7 @@ class DavDetailsContainer : public HostDetailsContainer virtual bool verifyScheme( const OUString& rScheme ) override; private: - DECL_LINK_TYPED( ToggledDavsHdl, CheckBox&, void ); + DECL_LINK( ToggledDavsHdl, CheckBox&, void ); }; class SmbDetailsContainer : public DetailsContainer @@ -150,8 +150,8 @@ class CmisDetailsContainer : public DetailsContainer private: void selectRepository( ); - DECL_LINK_TYPED ( RefreshReposHdl, Button*, void ); - DECL_LINK_TYPED ( SelectRepoHdl, ListBox&, void ); + DECL_LINK ( RefreshReposHdl, Button*, void ); + DECL_LINK ( SelectRepoHdl, ListBox&, void ); }; #endif diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 47e89f574291..69d3bef4bc4f 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -123,14 +123,14 @@ namespace svt // initialize the dialog from the configuration data void loadConfiguration(); - DECL_LINK_TYPED(OnFieldScroll, ScrollBar*, void); - DECL_LINK_TYPED(OnFieldSelect, ListBox&, void); - DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void); - DECL_STATIC_LINK_TYPED(AddressBookSourceDialog, OnComboGetFocus, Control&, void); - DECL_LINK_TYPED(OnComboLoseFocus, Control&, void); - DECL_LINK_TYPED(OnComboSelect, ComboBox&, void); - DECL_LINK_TYPED(OnOkClicked, Button*, void); - DECL_LINK_TYPED(OnDelayedInitialize, void*, void); + DECL_LINK(OnFieldScroll, ScrollBar*, void); + DECL_LINK(OnFieldSelect, ListBox&, void); + DECL_LINK(OnAdministrateDatasources, Button*, void); + DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, Control&, void); + DECL_LINK(OnComboLoseFocus, Control&, void); + DECL_LINK(OnComboSelect, ComboBox&, void); + DECL_LINK(OnOkClicked, Button*, void); + DECL_LINK(OnDelayedInitialize, void*, void); }; diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index abb3308755ec..ceee99b4bacc 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -40,8 +40,8 @@ class SVT_DLLPUBLIC AsynchronLink void* _pArg; ::osl::Mutex* _pMutex; - DECL_DLLPRIVATE_LINK_TYPED( HandleCall_Idle, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HandleCall_PostUserEvent, void*, void ); + DECL_DLLPRIVATE_LINK( HandleCall_Idle, Idle*, void ); + DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void*, void ); SVT_DLLPRIVATE void Call_Impl( void* pArg ); public: diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx index 79e36016380e..78777a176320 100644 --- a/include/svtools/autocmpledit.hxx +++ b/include/svtools/autocmpledit.hxx @@ -23,7 +23,7 @@ private: std::vector< OUString > m_aMatching; std::vector< OUString >::size_type m_nCurrent; - DECL_DLLPRIVATE_LINK_TYPED(AutoCompleteHdl_Impl, Edit&, void); + DECL_DLLPRIVATE_LINK(AutoCompleteHdl_Impl, Edit&, void); bool Match( const OUString& rText ); bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index ac23e9b427b2..87273a5a36bc 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -46,7 +46,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox void appendField(); bool showField( unsigned int nIndex, unsigned int nWidthMax ); - DECL_LINK_TYPED( ClickLinkHdl, FixedHyperlink&, void ); + DECL_LINK( ClickLinkHdl, FixedHyperlink&, void ); public: Breadcrumb( vcl::Window* pParent ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 30cee3c8331c..cdaca6b320dd 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -292,9 +292,9 @@ private: SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( StartDragHdl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( StartDragHdl, HeaderBar*, void ); SVT_DLLPRIVATE long GetFrozenWidth() const; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index cb69224ba288..70e1b7f4c5a8 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -243,7 +243,7 @@ private: protected: - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); @@ -344,9 +344,9 @@ private: bool mbToday; bool mbNone; - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar*, void ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); public: CalendarField( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index a9c5b184629e..e934adfcc6bb 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -114,7 +114,7 @@ namespace svt void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); - DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); + DECL_LINK( OnWindowEvent, VclWindowEvent&, void ); private: DialogController( const DialogController& ) = delete; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9dcba3ba6a12..8103789ac71a 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -249,7 +249,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -269,7 +269,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -302,7 +302,7 @@ namespace svt CheckBox& GetBox() {return *pBox;}; private: - DECL_LINK_TYPED( OnClick, Button*, void ); + DECL_LINK( OnClick, Button*, void ); }; @@ -321,7 +321,7 @@ namespace svt protected: virtual bool WantMouseEvent() const override; private: - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); }; @@ -354,7 +354,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); }; @@ -388,7 +388,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); + DECL_LINK(ListBoxSelectHdl, ListBox&, void); }; @@ -659,10 +659,10 @@ namespace svt SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); SVT_DLLPRIVATE void impl_construct(); - DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( StartEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CellModifiedHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ModifyHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( StartEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK( EndEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK( CellModifiedHdl, void*, void ); }; diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index 480dae53c302..0a1bc42b9200 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -32,7 +32,7 @@ private: ::std::function<void ()> mpCallback; bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; - DECL_LINK_TYPED(TimerHandler, Idle *, void); + DECL_LINK(TimerHandler, Idle *, void); public: void resetTimer(); diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 0e976bb45cbd..7108f444cbac 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -58,7 +58,7 @@ protected: SVT_DLLPRIVATE void GetFocus() override; SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) override; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ButtonHdl, Button*, void ); public: FileControl( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index e1a02465e391..70c21e1ee7c8 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -74,8 +74,8 @@ private: bool bSortColumn; css::uno::Sequence< OUString > mpBlackList; - DECL_DLLPRIVATE_LINK_TYPED( HeaderSelect_Impl, HeaderBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); protected: virtual void GetFocus() override; diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index e90a6b6e9a54..9014fd977c5b 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -47,7 +47,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, void ); private: VclPtr<ToolBox> m_pToolbox; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 025107bef43a..6527ebbb1661 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -138,7 +138,7 @@ namespace svt virtual void implInitialize(const css::uno::Any& _rValue); private: - DECL_LINK_TYPED( OnDialogDying, VclWindowEvent&, void ); + DECL_LINK( OnDialogDying, VclWindowEvent&, void ); /** ensures that m_pDialog is not <NULL/> diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index de273d8ae552..66cb2ff25280 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -309,7 +309,7 @@ private: bool bEnlarge ) const; - DECL_LINK_TYPED( ImplAutoSwapOutHdl, Timer*, void ); + DECL_LINK( ImplAutoSwapOutHdl, Timer*, void ); // restart SwapOut timer; this is like touching in a cache to reset to the full timeout value void SVT_DLLPRIVATE restartSwapOutTimer() const; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 5ad086592e32..46b22333bb7a 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -48,7 +48,7 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode ); SVT_DLLPRIVATE void TryAutoComplete(); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); - DECL_DLLPRIVATE_LINK_TYPED( AutoCompleteHdl_Impl, Edit&, void ); + DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, Edit&, void ); SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index a01e04afca70..4214c6678abe 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -111,7 +111,7 @@ namespace svt virtual void impl_setPopupMenu(); static OUString determineBaseURL( const OUString& aURL ); - DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void ); bool m_bInitialized; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 075b1fb2885b..4a05a62947f9 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -50,9 +50,9 @@ private: SVT_DLLPRIVATE void ImplSetInfo(); - DECL_DLLPRIVATE_LINK_TYPED( ImplPropertiesHdl, Button*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplChangePrinterHdl, ListBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer*, void ); public: PrinterSetupDialog( vcl::Window* pWindow ); diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index cc4ced797fd2..86d0bbd30428 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -206,7 +206,7 @@ namespace svt void updateRoadmapItemLabel( WizardState _nState ); private: - DECL_DLLPRIVATE_LINK_TYPED( OnRoadmapItemSelected, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, LinkParamNone*, void ); /** updates the roadmap control to show the given path, as far as possible (modulo conflicts with other paths) diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 4e5571ab9421..0de9d5604d56 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -58,8 +58,8 @@ private: bVCenter:1; SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar *, void ); - DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar *, void ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar *, void ); public: ScrollableWindow( vcl::Window* pParent ); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 051e991732ff..500d23868c89 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -66,11 +66,11 @@ private: const CollatorWrapper aCollator; - DECL_LINK_TYPED( StartDragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( DragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void ); - DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); - DECL_LINK_TYPED( CompareHdl, const SvSortData&, sal_Int32 ); + DECL_LINK( StartDragHdl, HeaderBar*, void ); + DECL_LINK( DragHdl, HeaderBar*, void ); + DECL_LINK( EndDragHdl, HeaderBar*, void ); + DECL_LINK( HeaderBarClick, HeaderBar*, void ); + DECL_LINK( CompareHdl, const SvSortData&, sal_Int32 ); protected: diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 9406dd5743ee..b184702c1853 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -44,7 +44,7 @@ enum SvParserState class SVT_DLLPUBLIC SvParser : public SvRefBase { - DECL_LINK_TYPED( NewDataRead, LinkParamNone*, void ); + DECL_LINK( NewDataRead, LinkParamNone*, void ); protected: SvStream& rInput; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index c07aaa1b2a91..c1cd12fcd1f9 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -131,8 +131,8 @@ private: ::svt::IAccessibleTabListBox* m_pAccessible; AccessibleChildren m_aAccessibleChildren; - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl_Impl, SvTreeListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( CreateAccessibleHdl_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, HeaderBar*, void ); void RecalculateAccessibleChildren(); diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index e4967ac8982b..5549825d411a 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -351,9 +351,9 @@ private: SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - DECL_DLLPRIVATE_LINK_TYPED(ImplClickHdl, Button*, void); + DECL_DLLPRIVATE_LINK(ImplClickHdl, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(ImplAddClickHandler, Button*, void); + DECL_DLLPRIVATE_LINK(ImplAddClickHandler, Button*, void); ImplTabBarItem* seek( size_t i ); ImplTabBarItem* prev(); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 11486356bf5d..408b2f453ca2 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -106,7 +106,7 @@ protected: void DataChanged( const DataChangedEvent& rDCEvt ) override; private: - DECL_LINK_TYPED( HighlightHdl, ValueSet*, void ); + DECL_LINK( HighlightHdl, ValueSet*, void ); void initStatusListener(); diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 7f307679005e..75b1ab23e0fb 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -149,7 +149,7 @@ class SVT_DLLPUBLIC ToolboxController : {} }; - DECL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, void ); + DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, void ); typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 900077932ad1..5898ad7434b3 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -270,10 +270,10 @@ protected: private: void SetBaseModel(SvTreeList* pNewModel); - DECL_DLLPRIVATE_LINK_TYPED( CheckButtonClick, SvLBoxButtonData *, void ); - DECL_DLLPRIVATE_LINK_TYPED( TextEditEndedHdl_Impl, SvInplaceEdit2&, void ); + DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData *, void ); + DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, SvInplaceEdit2&, void ); // Handler that is called by TreeList to clone an Entry - DECL_DLLPRIVATE_LINK_TYPED( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* ); + DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* ); // Handler and methods for Drag - finished handler. // The Handle retrieved by GetDragFinishedHdl can be set on the @@ -283,7 +283,7 @@ private: // called for a deleted object. SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); - DECL_DLLPRIVATE_LINK_TYPED( DragFinishHdl_Impl, sal_Int8, void ); + DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8, void ); protected: @@ -751,7 +751,7 @@ public: // A Parent's Children are turned into Children of the Parent which comes next in hierarchy void RemoveParentKeepChildren( SvTreeListEntry* pParent ); - DECL_LINK_TYPED( DefaultCompare, const SvSortData&, sal_Int32 ); + DECL_LINK( DefaultCompare, const SvSortData&, sal_Int32 ); virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uLong nPos ) override; @@ -797,9 +797,9 @@ class SvInplaceEdit2 bool bAlreadyInCallBack; void CallCallBackHdl_Impl(); - DECL_LINK_TYPED( Timeout_Impl, Idle *, void ); - DECL_LINK_TYPED( ReturnHdl_Impl, Accelerator&, void ); - DECL_LINK_TYPED( EscapeHdl_Impl, Accelerator&, void ); + DECL_LINK( Timeout_Impl, Idle *, void ); + DECL_LINK( ReturnHdl_Impl, Accelerator&, void ); + DECL_LINK( EscapeHdl_Impl, Accelerator&, void ); public: SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 20fe873784ca..c4fe6b1aa497 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -268,8 +268,8 @@ private: SVT_DLLPRIVATE bool ImplHasAccessibleListeners(); SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel ); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void ); ValueSet (const ValueSet &) = delete; ValueSet & operator= (const ValueSet &) = delete; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index bc7ce509fbaa..58c20ddf16c4 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -343,9 +343,9 @@ namespace svt TabPage* GetOrCreatePage( const WizardState i_nState ); private: - DECL_DLLPRIVATE_LINK_TYPED(OnNextPage, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnPrevPage, Button*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFinish, Button*, void); + DECL_DLLPRIVATE_LINK(OnNextPage, Button*, void); + DECL_DLLPRIVATE_LINK(OnPrevPage, Button*, void); + DECL_DLLPRIVATE_LINK(OnFinish, Button*, void); SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 97564c58ef8f..91473c42ea89 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -166,14 +166,14 @@ void MyWizardDlg::ActivatePage() MyWizardDlg-Prev/Next-Handler ----------------------------- -IMPL_LINK_TYPED( MyWizardDlg, ImplPrevHdl, PushButton*, pBtn, void ) +IMPL_LINK( MyWizardDlg, ImplPrevHdl, PushButton*, pBtn, void ) { ShowPrevPage(); if ( !GetCurLevel() ) pBtn->Disable(); } -IMPL_LINK_TYPED( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) +IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn, void ) { ShowNextPage(); if ( GetCurLevel() < 3 ) @@ -203,7 +203,7 @@ private: sal_Int16 mnLeftAlignCount; bool mbEmptyViewMargin; - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleWizardLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleWizardLayoutTimerHdl, Idle*, void ); bool hasWizardPendingLayout() const; protected: diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index 7f1c1fc52a78..6dfa031bbce6 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -35,7 +35,7 @@ private: Link<SvxPresetListBox*,void> maRenameHdl; Link<SvxPresetListBox*,void> maDeleteHdl; - DECL_LINK_TYPED( OnMenuItemSelected, Menu*, bool ); + DECL_LINK( OnMenuItemSelected, Menu*, bool ); template< typename ListType, typename EntryType > void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index e94dc5d2d9a8..011c2ec0bd7e 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -121,7 +121,7 @@ private: void InitSettings(vcl::RenderContext& rRenderContext); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; - DECL_LINK_TYPED(VscrollHdl, ScrollBar*, void); + DECL_LINK(VscrollHdl, ScrollBar*, void); void init(); Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index b212162feab0..aef95d3e31a3 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -56,7 +56,7 @@ protected: // DragSourceHelper virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) override; - DECL_LINK_TYPED(ExecDragHdl, void*, void); + DECL_LINK(ExecDragHdl, void*, void); public: SvxColorValueSet_docking( vcl::Window* pParent ); @@ -86,7 +86,7 @@ private: void FillValueSet(); void SetSize(); - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); /** This function is called when the window gets the focus. It grabs the focus to the color value set so that it can be controlled with diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index eb863a166f55..361a7185e6c8 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -63,17 +63,17 @@ private: void Initialize(); - DECL_LINK_TYPED( EndSlideHdl, Slider*, void ); - DECL_LINK_TYPED( NewInterpolationModifiedHdl, ListBox&, void ); - DECL_LINK_TYPED( NewQualityModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewCompressionModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewWidthModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( NewHeightModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ResolutionModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( ToggleCompressionRB, RadioButton&, void ); - DECL_LINK_TYPED( ToggleReduceResolutionRB, CheckBox&, void ); - - DECL_LINK_TYPED( CalculateClickHdl, Button*, void ); + DECL_LINK( EndSlideHdl, Slider*, void ); + DECL_LINK( NewInterpolationModifiedHdl, ListBox&, void ); + DECL_LINK( NewQualityModifiedHdl, Edit&, void ); + DECL_LINK( NewCompressionModifiedHdl, Edit&, void ); + DECL_LINK( NewWidthModifiedHdl, Edit&, void ); + DECL_LINK( NewHeightModifiedHdl, Edit&, void ); + DECL_LINK( ResolutionModifiedHdl, Edit&, void ); + DECL_LINK( ToggleCompressionRB, RadioButton&, void ); + DECL_LINK( ToggleReduceResolutionRB, CheckBox&, void ); + + DECL_LINK( CalculateClickHdl, Button*, void ); void Update(); void UpdateNewWidthMF(); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 50aa6544fac3..de280f393da2 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -193,13 +193,13 @@ private: VclPtr<Edit> m_pEdComment; bool bModified; - DECL_LINK_TYPED( SelDateHdl, ListBox&, void ); - DECL_LINK_TYPED( RowEnableHdl, Button*, void ); - DECL_LINK_TYPED( TimeHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyDate, Edit&, void ); - DECL_LINK_TYPED( RefHandle, Button*, void ); + DECL_LINK( SelDateHdl, ListBox&, void ); + DECL_LINK( RowEnableHdl, Button*, void ); + DECL_LINK( TimeHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( ModifyListBoxHdl, ListBox&, void ); + DECL_LINK( ModifyDate, Edit&, void ); + DECL_LINK( RefHandle, Button*, void ); protected: @@ -294,7 +294,7 @@ private: bool bEnableRejectAll; bool bEnableUndo; - DECL_LINK_TYPED( PbClickHdl, Button*, void ); + DECL_LINK( PbClickHdl, Button*, void ); public: SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 68d8f20c86c1..fd322199f75f 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -155,10 +155,10 @@ protected: private: void InvalidateControl(); - DECL_LINK_TYPED( LinkedFieldModifyHdl, Edit&, void ); - DECL_LINK_TYPED( LinkedFieldFocusHdl, Control&, void ); + DECL_LINK( LinkedFieldModifyHdl, Edit&, void ); + DECL_LINK( LinkedFieldFocusHdl, Control&, void ); void LinkedFieldModifyHdl(); - DECL_LINK_TYPED(SpinFieldHdl, SpinField&, void); + DECL_LINK(SpinFieldHdl, SpinField&, void); }; /** Wrapper for usage of a DialControl in item connections. */ diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 2fcdfcb31879..8e48d52090e7 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -173,10 +173,10 @@ public: protected: - DECL_LINK_TYPED( InternalInteractiveChange, Svx3DLightControl*, void); - DECL_LINK_TYPED( InternalSelectionChange, Svx3DLightControl*, void); - DECL_LINK_TYPED( ScrollBarMove, ScrollBar*, void); - DECL_LINK_TYPED( ButtonPress, Button*, void); + DECL_LINK( InternalInteractiveChange, Svx3DLightControl*, void); + DECL_LINK( InternalSelectionChange, Svx3DLightControl*, void); + DECL_LINK( ScrollBarMove, ScrollBar*, void); + DECL_LINK( ButtonPress, Button*, void); // initialize local parameters void Init(); diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index e5f447465416..c7181a8a1ab3 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -60,8 +60,8 @@ private: sal_Int32 mnLastPosHatch; sal_Int32 mnLastPosBitmap; - DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void); - DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void); + DECL_LINK(SelectFillTypeHdl, ListBox&, void); + DECL_LINK(SelectFillAttrHdl, ListBox&, void); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index d5c211ed4a13..4cd2b4979e5b 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -186,16 +186,16 @@ private: // ItemSet used to remember set 2d attributes SfxItemSet* mpRemember2DAttributes; - DECL_LINK_TYPED( ClickViewTypeHdl, Button*, void ); - DECL_LINK_TYPED( ClickUpdateHdl, Button*, void ); - DECL_LINK_TYPED( ClickAssignHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ClickColorHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( ClickViewTypeHdl, Button*, void ); + DECL_LINK( ClickUpdateHdl, Button*, void ); + DECL_LINK( ClickAssignHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ClickColorHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); void ClickLight(PushButton &rBtn); - DECL_LINK_TYPED( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void ); + DECL_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void ); SVX_DLLPRIVATE void Construct(); SVX_DLLPRIVATE void Reset(); diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 2b5f0a586aef..f2e114c50ce9 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -79,7 +79,7 @@ protected: */ void notifyColumnSelect(sal_uInt16 nColumnId); private: - DECL_LINK_TYPED( OnAsyncExecuteDrop, void*, void ); + DECL_LINK( OnAsyncExecuteDrop, void*, void ); }; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 67f8cefbf103..fdc0131a8227 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -520,8 +520,8 @@ protected: void selectionChanged(); void columnChanged(); - DECL_LINK_TYPED(OnQueryGridSlotState, DbGridControlNavigationBarState, int); - DECL_LINK_TYPED(OnExecuteGridSlot, DbGridControlNavigationBarState, bool); + DECL_LINK(OnQueryGridSlotState, DbGridControlNavigationBarState, int); + DECL_LINK(OnExecuteGridSlot, DbGridControlNavigationBarState, bool); }; diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx index fa8515102ab1..50d81cc3f11c 100644 --- a/include/svx/fmobjfac.hxx +++ b/include/svx/fmobjfac.hxx @@ -33,7 +33,7 @@ public: FmFormObjFactory(); ~FmFormObjFactory(); - DECL_STATIC_LINK_TYPED(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); + DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; #endif // _FM_FMOBJFAC_HXX diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index ffcb6c1346fd..f58d1f61f87b 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -348,7 +348,7 @@ private: void OnSearchTerminated(); // is used by SearchThread, after the return from this handler the thread removes itself - DECL_LINK_TYPED(OnNewRecordCount, sal_Int32, void); + DECL_LINK(OnNewRecordCount, sal_Int32, void); }; #endif // INCLUDED_SVX_FMSRCIMP_HXX diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 8ef0eb84187a..5fe6ad0f7eb3 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -143,14 +143,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow friend class SvxFontWorkChildWindow; friend class SvxFontWorkControllerItem; - DECL_LINK_TYPED( SelectStyleHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( SelectAdjustHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( SelectShadowHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectStyleHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectAdjustHdl_Impl, ToolBox *, void ); + DECL_LINK( SelectShadowHdl_Impl, ToolBox *, void ); - DECL_LINK_TYPED( ModifyInputHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( InputTimoutHdl_Impl, Idle *, void ); + DECL_LINK( ModifyInputHdl_Impl, Edit&, void ); + DECL_LINK( InputTimoutHdl_Impl, Idle *, void ); - DECL_LINK_TYPED( ColorSelectHdl_Impl, ListBox&, void ); + DECL_LINK( ColorSelectHdl_Impl, ListBox&, void ); void SetStyle_Impl(const XFormTextStyleItem*); void SetAdjust_Impl(const XFormTextAdjustItem*); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 0149c022c26a..3c2368cdb9c2 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -68,8 +68,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog SdrView* mpSdrView; - DECL_LINK_TYPED( DoubleClickFavoriteHdl, ValueSet*, void ); - DECL_LINK_TYPED( ClickOKHdl, Button*, void ); + DECL_LINK( DoubleClickFavoriteHdl, ValueSet*, void ); + DECL_LINK( ClickOKHdl, Button*, void ); SdrObject** mppSdrObject; SdrModel* mpDestModel; diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 1cb11c82ad20..35f79fd076fa 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -46,7 +46,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; private: - DECL_LINK_TYPED( WaitDoubleClickHdl, Timer*, void ); + DECL_LINK( WaitDoubleClickHdl, Timer*, void ); void impl_executePaintBrush(); private: diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 6ae29851ef5a..fd0aa8badf82 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -130,7 +130,7 @@ public: SgaUserDataFactory() { SdrObjFactory::InsertMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); } ~SgaUserDataFactory() { SdrObjFactory::RemoveMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); } - DECL_STATIC_LINK_TYPED( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); + DECL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); }; class GraphicFilter; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 49d2f2e263ed..b4dab163f1c8 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control bool bAnim; bool mbInIdleUpdate; - DECL_LINK_TYPED( UpdateHdl, Idle*, void ); + DECL_LINK( UpdateHdl, Idle*, void ); rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index bc48342c9995..dc3a1d1ecfb8 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -219,7 +219,7 @@ public: virtual void StateChanged( StateChangedType nType ) override; private: - DECL_LINK_TYPED(OnClick, Button*, void); + DECL_LINK(OnClick, Button*, void); void PositionDataSource(sal_Int32 nRecord); }; @@ -589,9 +589,9 @@ protected: protected: void ImplInitWindow( const InitWindowFacet _eInitWhat ); - DECL_LINK_TYPED(OnDelete, void*, void); + DECL_LINK(OnDelete, void*, void); - DECL_LINK_TYPED(OnAsyncAdjust, void*, void); + DECL_LINK(OnAsyncAdjust, void*, void); // if the param is != NULL, AdjustRows will be called, else AdjustDataSource private: diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index f7a6b7674e64..97f6b66a4d59 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -92,12 +92,12 @@ protected: bool mbEnableDrawingLayerFillStyles : 1; void InitHandler(); - DECL_LINK_TYPED(TurnOnHdl, Button*, void); - DECL_LINK_TYPED(DistModify, Edit&, void); - DECL_LINK_TYPED(HeightModify, Edit&, void); - DECL_LINK_TYPED(BorderModify, Edit&, void); - DECL_LINK_TYPED(BackgroundHdl, Button*, void); - DECL_LINK_TYPED(RangeFocusHdl, Control&, void); + DECL_LINK(TurnOnHdl, Button*, void); + DECL_LINK(DistModify, Edit&, void); + DECL_LINK(HeightModify, Edit&, void); + DECL_LINK(BorderModify, Edit&, void); + DECL_LINK(BackgroundHdl, Button*, void); + DECL_LINK(RangeFocusHdl, Control&, void); void RangeHdl(); void UpdateExample(); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 50dc9fed2572..6747d5afe40d 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -118,16 +118,16 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow virtual bool Close() override; - DECL_LINK_TYPED( TbxClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( InfoHdl, IMapWindow&, void ); - DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( URLModifyHdl, Edit&, void ); - DECL_LINK_TYPED( URLModifyComboBoxHdl, ComboBox&, void ); - DECL_LINK_TYPED( URLLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( UpdateHdl, Idle *, void ); - DECL_LINK_TYPED( StateHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( TbxClickHdl, ToolBox*, void ); + DECL_LINK( InfoHdl, IMapWindow&, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); + DECL_LINK( URLModifyHdl, Edit&, void ); + DECL_LINK( URLModifyComboBoxHdl, ComboBox&, void ); + DECL_LINK( URLLoseFocusHdl, Control&, void ); + DECL_LINK( UpdateHdl, Idle *, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); void DoOpen(); bool DoSave(); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f6a50c3d967d..c5bc3c17a20d 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -41,7 +41,7 @@ class SvxLineBox : public LineLB SfxObjectShell* mpSh; css::uno::Reference< css::frame::XFrame > mxFrame; - DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void); + DECL_LINK(DelayHdl_Impl, Timer *, void); void ReleaseFocus_Impl(); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 474348e9a07f..a32e5f0ee452 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -181,7 +181,7 @@ private: SVX_DLLPRIVATE virtual void ImplSaveValue() override; SVX_DLLPRIVATE virtual sal_Int32 ImplGetSavedValue() const override; - DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); + DECL_LINK( EditModifyHdl, Edit&, void ); }; #endif diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index e3d1b0b25584..44cc61fcf6ad 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -37,8 +37,8 @@ protected: void Impl_SetInfo( sal_Int32 nCount ); - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index e11ef5b7b9f2..e29fe6c785aa 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -90,7 +90,7 @@ private: css::uno::Reference< css::frame::XFrame > mxFrame; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); void FillValueSet(); void SetSize(); void implInit(); diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 354d0ebae09a..d820fb21cb39 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -43,7 +43,7 @@ public: SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); private: // Links - DECL_LINK_TYPED( OnTimer, Idle *, void ); + DECL_LINK( OnTimer, Idle *, void ); private: // Functions void _repaint(); diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 0979d2c74f39..708eeb78ef97 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet void init(); protected: - DECL_LINK_TYPED(FormatHdl_Impl, Idle *, void); + DECL_LINK(FormatHdl_Impl, Idle *, void); public: SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index b06020c276d9..8c9761e6b6d6 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -40,7 +40,7 @@ public: E3dObjFactory(); ~E3dObjFactory(); - DECL_STATIC_LINK_TYPED(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); + DECL_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*); }; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index b0e2e59f92a8..ab00b9fe37b9 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -141,10 +141,10 @@ protected: private: bool bAttrModified; - DECL_LINK_TYPED( ClickRotateHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeDrawHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeGridsnapHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeDivisionHdl_Impl, Edit&, void ); + DECL_LINK( ClickRotateHdl_Impl, Button*, void ); + DECL_LINK( ChangeDrawHdl_Impl, Edit&, void ); + DECL_LINK( ChangeGridsnapHdl_Impl, Button*, void ); + DECL_LINK( ChangeDivisionHdl_Impl, Edit&, void ); }; #endif diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 434d66660125..448c78513942 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -47,8 +47,8 @@ private: bool bEmpty; - DECL_LINK_TYPED(ButtonHdl, Button*, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(ButtonHdl, Button*, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 3a8bfed02ea9..fb71960ffbef 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -116,16 +116,16 @@ class SvxRubyDialog : public SfxModelessDialog SfxBindings* pBindings; - DECL_LINK_TYPED(ApplyHdl_Impl, Button*, void); - DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); - DECL_LINK_TYPED(StylistHdl_Impl, Button*, void); - DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void); - DECL_LINK_TYPED(PositionHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(AdjustHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(CharStyleHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); - DECL_LINK_TYPED(EditScrollHdl_Impl, sal_Int32, bool); - DECL_LINK_TYPED(EditJumpHdl_Impl, sal_Int32, void); + DECL_LINK(ApplyHdl_Impl, Button*, void); + DECL_LINK(CloseHdl_Impl, Button*, void); + DECL_LINK(StylistHdl_Impl, Button*, void); + DECL_LINK(ScrollHdl_Impl, ScrollBar*, void); + DECL_LINK(PositionHdl_Impl, ListBox&, void); + DECL_LINK(AdjustHdl_Impl, ListBox&, void); + DECL_LINK(CharStyleHdl_Impl, ListBox&, void); + DECL_LINK(EditModifyHdl_Impl, Edit&, void); + DECL_LINK(EditScrollHdl_Impl, sal_Int32, bool); + DECL_LINK(EditJumpHdl_Impl, sal_Int32, void); void SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight); void GetRubyText(); diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 7a81bbbc4c5d..d8a78516b156 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -214,8 +214,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener long GetLeftMin() const; long GetRightMax() const; - DECL_LINK_TYPED( TabMenuSelect, Menu *, bool ); - DECL_LINK_TYPED( MenuSelect, Menu *, bool ); + DECL_LINK( TabMenuSelect, Menu *, bool ); + DECL_LINK( MenuSelect, Menu *, bool ); void PrepareProportional_Impl(RulerType); enum class UpdateType diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 0ea072adafa3..b69cbd801bd5 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -159,7 +159,7 @@ private: SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos ); - DECL_LINK_TYPED( UpdateHdl, void *, void ); + DECL_LINK( UpdateHdl, void *, void ); //TableModelRef mxTable; rtl::Reference< TableModel > mxTable; diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index b3a37c068b79..18c58176bb7a 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -160,16 +160,16 @@ protected: sfx2::sidebar::SidebarController* mpSidebarController; - DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void ); - DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void ); - DECL_LINK_TYPED(ChangeGradientAngle, Edit&, void); - DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void); - DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void); + DECL_LINK(SelectFillTypeHdl, ListBox&, void ); + DECL_LINK(SelectFillAttrHdl, ListBox&, void ); + DECL_LINK(ChangeGradientAngle, Edit&, void); + DECL_LINK(ChangeTrgrTypeHdl_Impl, ListBox&, void); + DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK(ModifyTransSliderHdl, Slider*, void); + DECL_LINK(ClickImportBitmapHdl, Button*, void); // for transparency gradient - DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void ); + DECL_LINK( ClickTrGrHdl_Impl, ToolBox*, void ); void Initialize(); void Update(); diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 0d173380c527..0cab1bd447bb 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -160,13 +160,13 @@ private: void Initialize(); - DECL_LINK_TYPED(ChangeLineStyleHdl, ListBox&, void); - DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(ChangeTransparentHdl, Edit&, void ); - DECL_LINK_TYPED(ChangeStartHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeEndHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeEdgeStyleHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeCapStyleHdl, ListBox&, void); + DECL_LINK(ChangeLineStyleHdl, ListBox&, void); + DECL_LINK(ToolboxWidthSelectHdl, ToolBox*, void); + DECL_LINK(ChangeTransparentHdl, Edit&, void ); + DECL_LINK(ChangeStartHdl, ListBox&, void); + DECL_LINK(ChangeEndHdl, ListBox&, void); + DECL_LINK(ChangeEdgeStyleHdl, ListBox&, void); + DECL_LINK(ChangeCapStyleHdl, ListBox&, void); }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index bdeeebe6c50f..fd7a0ea8215b 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -57,8 +57,8 @@ private: Image m_aIMGCus; Image m_aIMGCusGray; - DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void); - DECL_LINK_TYPED(MFModifyHdl, Edit&, void); + DECL_LINK(VSSelectHdl, ValueSet*, void); + DECL_LINK(MFModifyHdl, Edit&, void); }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 7b1c15cdb853..d69607b89b90 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -29,7 +29,7 @@ private: bool m_bInClose; bool hasPanelPendingLayout() const; - DECL_DLLPRIVATE_LINK_TYPED(ImplHandlePanelLayoutTimerHdl, Idle*, void); + DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void); public: PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 89a5ee728017..8a598a6ecb54 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -234,17 +234,17 @@ private: mutable sal_Int32 nTransliterationFlags; - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( FlagHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CommandHdl_Impl, Button*, void ); - DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void); - DECL_LINK_TYPED( FocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( LBSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(LoseFocusHdl_Impl, Control&, void); - DECL_LINK_TYPED(FormatHdl_Impl, Button*, void); - DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void); - DECL_LINK_TYPED(AttributeHdl_Impl, Button*, void); - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( FlagHdl_Impl, Button*, void ); + DECL_LINK( CommandHdl_Impl, Button*, void ); + DECL_LINK(TemplateHdl_Impl, Button*, void); + DECL_LINK( FocusHdl_Impl, Control&, void ); + DECL_LINK( LBSelectHdl_Impl, ListBox&, void ); + DECL_LINK(LoseFocusHdl_Impl, Control&, void); + DECL_LINK(FormatHdl_Impl, Button*, void); + DECL_LINK(NoFormatHdl_Impl, Button*, void); + DECL_LINK(AttributeHdl_Impl, Button*, void); + DECL_LINK( TimeoutHdl_Impl, Timer*, void ); void ClickHdl_Impl(void* pCtrl); void Construct_Impl(); diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index d293e3afb356..64abea3efdf3 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -117,7 +117,7 @@ protected: // Chaining void ImpChainingEventHdl(); - DECL_LINK_TYPED(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void); + DECL_LINK(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void); // Check if the whole text is selected. @@ -126,17 +126,17 @@ protected: void ImpMakeTextCursorAreaVisible(); // handler for AutoGrowing text with active Outliner - DECL_LINK_TYPED(ImpOutlinerStatusEventHdl, EditStatus&, void); - DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void); + DECL_LINK(ImpOutlinerStatusEventHdl, EditStatus&, void); + DECL_LINK(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void); // link for EndTextEditHdl - DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void); + DECL_LINK(EndTextEditHdl, SdrUndoManager*, void); void ImpMacroUp(const Point& rUpPos); void ImpMacroDown(const Point& rDownPos); - DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos*, void ); - DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos*, void ); + DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos*, void ); + DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos*, void ); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index c2bcefb44431..8b3c01e3054e 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -184,7 +184,7 @@ class OLEObjCache void UnloadOnDemand(); static bool UnloadObj( SdrOle2Obj* pObj ); - DECL_LINK_TYPED( UnloadCheckHdl, Timer*, void ); + DECL_LINK( UnloadCheckHdl, Timer*, void ); public: OLEObjCache(); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 43fc5568ee0c..0a001b065bee 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -313,7 +313,7 @@ public: void Set2ndPos(const Point& rPnt); // the link called by the color handles - DECL_LINK_TYPED(ColorChangeHdl, SdrHdlColor*, void); + DECL_LINK(ColorChangeHdl, SdrHdlColor*, void); // transformation call, create gradient from this handle void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo); diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 81c7969e4bc8..caae687a7ae2 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -111,7 +111,7 @@ private: void ImpLinkAbmeldung(); bool ImpUpdateGraphicLink( bool bAsynchron = true ) const; void ImpSetLinkedGraphic( const Graphic& rGraphic ); - DECL_LINK_TYPED( ImpSwapHdl, const GraphicObject*, SvStream* ); + DECL_LINK( ImpSwapHdl, const GraphicObject*, SvStream* ); void onGraphicChanged(); public: diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 07cacf1ebfd7..cde8018d76fa 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -223,7 +223,7 @@ public: private: SVX_DLLPRIVATE void ImpClearVars(); - DECL_LINK_TYPED(ImpComeBackHdl, Idle*, void); + DECL_LINK(ImpComeBackHdl, Idle*, void); protected: sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index a1505473cc5c..6785370fb1e2 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -169,7 +169,7 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; - DECL_LINK_TYPED( VisibilityNotification, SvxStyleBox_Impl&, void ); + DECL_LINK( VisibilityNotification, SvxStyleBox_Impl&, void ); protected: // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) @@ -236,7 +236,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl BorderColorStatus maBorderColorStatus; bool bSidebarType; ColorSelectFunction maColorSelectFunction; - DECL_LINK_TYPED(SelectedHdl, const Color&, void); + DECL_LINK(SelectedHdl, const Color&, void); public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 13cf1685fbab..628e7b754bfe 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -47,7 +47,7 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase bool m_bAssertOnDialog; public: - DECL_STATIC_LINK_TYPED( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); + DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true ); virtual ~BootstrapFixture() override; diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index 1c73a62b4414..1003a536e1cb 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -62,7 +62,7 @@ namespace toolkit virtual void SetScrollTop( long Top ) override; void setScrollVisibility( ScrollBarVisibility rState ); - DECL_LINK_TYPED( ScrollBarHdl, ScrollBar*, void ); + DECL_LINK( ScrollBarHdl, ScrollBar*, void ); virtual void ResetScrollBars(); // Window virtual void Resize() override; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 1fea9e5c9851..3f37fd589605 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -64,8 +64,8 @@ private: VCLExternalSolarLock* m_pSolarLock; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); void DisconnectEvents(); protected: diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 8ca1ab2bece9..77dc70911e02 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -67,7 +67,7 @@ private: protected: ::osl::Mutex& GetMutex() { return maMutex; } - DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); + DECL_LINK( MenuEventListener, VclMenuEvent&, void ); void ImplCreateMenu( bool bPopup ); diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index af10c4f0aa41..611e1dadff7e 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -82,7 +82,7 @@ private: protected: Size ImplCalcWindowSize( const Size& rOutSz ) const; - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void ); + DECL_LINK(WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual css::uno::Reference< css::accessibility::XAccessibleContext > diff --git a/include/tools/link.hxx b/include/tools/link.hxx index f46e84e7c578..8b65be4755dd 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -24,42 +24,42 @@ #include <sal/types.h> -#define DECL_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_LINK(Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ RetType Member(ArgType) -#define DECL_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_STATIC_LINK(Class, Member, ArgType, RetType) \ static RetType LinkStub##Member(void *, ArgType); \ static RetType Member(Class *, ArgType) -#define DECL_DLLPRIVATE_LINK_TYPED(Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_LINK(Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE RetType Member(ArgType) -#define DECL_DLLPRIVATE_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ +#define DECL_DLLPRIVATE_STATIC_LINK(Class, Member, ArgType, RetType) \ SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ SAL_DLLPRIVATE static RetType Member(Class *, ArgType) -#define IMPL_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \ +#define IMPL_LINK(Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(ArgType ArgName) -#define IMPL_LINK_NOARG_TYPED(Class, Member, ArgType, RetType) \ +#define IMPL_LINK_NOARG(Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return static_cast<Class *>(instance)->Member(data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER ArgType) -#define IMPL_STATIC_LINK_TYPED( \ +#define IMPL_STATIC_LINK( \ Class, Member, ArgType, ArgName, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ } \ RetType Class::Member(SAL_UNUSED_PARAMETER Class *, ArgType ArgName) -#define IMPL_STATIC_LINK_NOARG_TYPED( \ +#define IMPL_STATIC_LINK_NOARG( \ Class, Member, ArgType, RetType) \ RetType Class::LinkStub##Member(void * instance, ArgType data) { \ return Member(static_cast<Class *>(instance), data); \ diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 75503dea309d..640ae95628cd 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -183,7 +183,7 @@ private: bool mbLoopTerminated; SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer*, void ); }; diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 4d54f8efd0c5..139033b21193 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -95,7 +95,7 @@ private: SAL_DLLPRIVATE void ImplInitButtonDialogData(); SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags ); SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( sal_uInt16 nId ) const; - DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button* pBtn, void ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, Button* pBtn, void ); SAL_DLLPRIVATE void ImplPosControls(); }; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 8350a212b396..36103705abd9 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -101,7 +101,7 @@ public: protected: /// Handler for click, in case we want the button to handle uno commands (.uno:Something). - DECL_STATIC_LINK_TYPED(Button, dispatchCommandHandler, Button*, void); + DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void); }; enum class PushButtonDropdownStyle diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index ab5a2e249d3e..59cac2799a9f 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -55,7 +55,7 @@ private: public: SAL_DLLPRIVATE void ImplDraw(); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void ); SAL_DLLPRIVATE void ImplShow(); SAL_DLLPRIVATE void ImplHide(); SAL_DLLPRIVATE void ImplResume( bool bRestore = false ); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 3246574bd418..da3aa7e37a46 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -56,7 +56,7 @@ private: SAL_DLLPRIVATE Dialog (const Dialog &) = delete; SAL_DLLPRIVATE Dialog & operator= (const Dialog &) = delete; - DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void*, void ); protected: using Window::ImplInit; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index a3d0a7bcfce3..7fb7a89fb4df 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -109,7 +109,7 @@ private: mbStartDockingEnabled:1, mbLocked:1; - DECL_LINK_TYPED( PopupModeEnd, FloatingWindow*, void ); + DECL_LINK( PopupModeEnd, FloatingWindow*, void ); void ImplEnableStartDocking() { mbStartDockingEnabled = true; } bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } @@ -245,7 +245,7 @@ private: SAL_DLLPRIVATE void ImplInitDockingWindowData(); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void ); DockingWindow (const DockingWindow &) = delete; DockingWindow & operator= (const DockingWindow &) = delete; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 05f56bc3afef..8bc6b2bf642d 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -97,7 +97,7 @@ private: css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC; - DECL_DLLPRIVATE_LINK_TYPED(ImplUpdateDataHdl, Timer*, void); + DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void); SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index 276c8879aed5..bbd11ce2d24d 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -32,7 +32,7 @@ namespace vcl ImplSVEvent * m_nId; Link<LinkParamNone*,void> m_aLink; - DECL_DLLPRIVATE_LINK_TYPED( DoEvent_Impl, void*, void ); + DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void ); public: EventPoster( const Link<LinkParamNone*,void>& rLink ); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index c1e0d3008565..414fcee0aac2 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -102,7 +102,7 @@ private: Link<FloatingWindow*,void> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); - DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void*, void ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox) override; FloatingWindow (const FloatingWindow &) = delete; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index a32b1013b4ab..2623498c29b0 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -232,7 +232,7 @@ private: sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = nullptr ); sal_uInt16 ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ); - DECL_LINK_TYPED( FilterCallback, ConvertData&, bool ); + DECL_LINK( FilterCallback, ConvertData&, bool ); protected: diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 6f75909dd109..862326041f91 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -391,7 +391,7 @@ private: private: friend class VclBuilder; void designate_label(vcl::Window *pWindow); - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); public: VclFrame(vcl::Window *pParent) : VclBin(pParent) @@ -479,7 +479,7 @@ private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; Link<VclExpander&,void> maExpandedHdl; - DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void); + DECL_DLLPRIVATE_LINK(ClickHdl, CheckBox&, void); }; class VCL_DLLPUBLIC VclScrolledWindow : public VclBin @@ -500,7 +500,7 @@ public: protected: virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; - DECL_LINK_TYPED(ScrollBarHdl, ScrollBar*, void); + DECL_LINK(ScrollBarHdl, ScrollBar*, void); void InitScrollBars(const Size &rRequest); virtual bool Notify(NotifyEvent& rNEvt) override; private: @@ -652,7 +652,7 @@ private: std::map< VclPtr<const vcl::Window>, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; - DECL_DLLPRIVATE_LINK_TYPED(ButtonHdl, Button *, void); + DECL_DLLPRIVATE_LINK(ButtonHdl, Button *, void); void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 455a82aa184b..f4ae404de91a 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -91,17 +91,17 @@ private: private: SAL_DLLPRIVATE void ImplInitListBoxData(); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ImplListBox*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplFocusHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl, LinkParamNone*, void ); - - DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplScrollHdl, ImplListBox*, void ); + DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); + DECL_DLLPRIVATE_LINK( ImplFocusHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, LinkParamNone*, void ); + + DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void ); protected: using Window::ImplInit; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6504edc8befc..38681ab2a169 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -183,7 +183,7 @@ protected: SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); - DECL_DLLPRIVATE_LINK_TYPED(ImplCallSelect, void*, void ); + DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void ); SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; } diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 535ad84b8bfc..6063c5a61f78 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -43,7 +43,7 @@ private: Link<MenuButton*,void> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); - DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void ); MenuButton( const MenuButton & ) = delete; MenuButton& operator=( const MenuButton & ) = delete; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 897f13f41a95..bef8f7170fc8 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -84,7 +84,7 @@ private: SAL_DLLPRIVATE bool ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags); SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); SAL_DLLPRIVATE Size getCurrentCalcSize() const; - DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, Timer*, void ); public: explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 140952b10b0d..430fe3af03fe 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -86,7 +86,7 @@ private: sal_uLong nUpdateInterval; sal_uInt16 nLockedMods; SelectionEngineFlags nFlags; - DECL_DLLPRIVATE_LINK_TYPED( ImpWatchDog, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer*, void ); inline bool ShouldDeselect( bool bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index a7e94d1a2eb7..3ab014c833b7 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -56,9 +56,9 @@ private: Link<Slider*,void> maSlideHdl; Link<Slider*,void> maEndSlideHdl; - DECL_LINK_TYPED(LinkedFieldModifyHdl, Edit&, void); - DECL_LINK_TYPED(LinkedFieldLoseFocusHdl, Control&, void); - DECL_LINK_TYPED(LinkedFieldSpinnerHdl, SpinField&, void); + DECL_LINK(LinkedFieldModifyHdl, Edit&, void); + DECL_LINK(LinkedFieldLoseFocusHdl, Control&, void); + DECL_LINK(LinkedFieldSpinnerHdl, SpinField&, void); using Control::ImplInitSettings; using Window::ImplInit; diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index b6168946d910..f88969c733b9 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -48,7 +48,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 552c939e6cb8..4e213e94c035 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: - DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void ); SAL_DLLPRIVATE void ImplInitSpinFieldData(); SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 9476fad9739c..4ac5084bb2fe 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1400,7 +1400,7 @@ public: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); private: - DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void ); + DECL_STATIC_LINK( Application, PostEventHandler, void*, void ); }; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 90b42fdcd6ff..d3a44e78f63d 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -178,7 +178,7 @@ public: private: SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); virtual void setPosSizeOnContainee(Size aSize, Window &rBox); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void ); protected: // Single argument ctors shall be explicit. diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index fcb35d376684..4e2ae4fc6652 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -76,8 +76,8 @@ protected: SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListBoxSelectHdl, ListBox&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplWindowEventListener, VclWindowEvent&, void ); + DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox&, void ); + DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclWindowEvent&, void ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index f528d0bde7cf..5a13c2390f6f 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -171,7 +171,7 @@ protected: void ImpTextHeightChanged(); void ImpTextFormatted(); - DECL_LINK_TYPED( IdleFormatHdl, Idle *, void ); + DECL_LINK( IdleFormatHdl, Idle *, void ); void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 ); diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 2f27657aafea..67baa061e3d5 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -38,7 +38,7 @@ namespace vcl long m_nReturn; bool m_bTimeout; - DECL_DLLPRIVATE_LINK_TYPED( worker, void*, void ); + DECL_DLLPRIVATE_LINK( worker, void*, void ); public: SolarThreadExecutor(); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index f98f891e7cba..8dfda97c5a62 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -84,7 +84,7 @@ private: AutoTimer maWaitTimer; ImageSet meImageSet; - DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; #endif // INCLUDED_VCL_THROBBER_HXX diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 51053e30cd07..fe3fa39d03e9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -206,10 +206,10 @@ private: SAL_DLLPRIVATE bool ImplHasExternalMenubutton(); SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCallExecuteCustomMenu, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCustomMenuListener, VclMenuEvent&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void*, void ); + DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent&, void ); + DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, Timer*, void ); ToolBox (const ToolBox &) = delete; ToolBox& operator= (const ToolBox &) = delete; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index c6436f9c7de9..f89447fc116c 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -43,7 +43,7 @@ private: protected: - DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void ); + DECL_LINK( ImpUpdateDataHdl, Timer*, void ); void StateChanged( StateChangedType nType ) override; void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 8c82fa9d6720..7de1c77b83a0 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -541,11 +541,11 @@ private: public: - DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer*, void ); + DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Idle*, void ); SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow ); |