diff options
Diffstat (limited to 'include/sfx2')
39 files changed, 108 insertions, 108 deletions
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; |