diff options
Diffstat (limited to 'include/svtools')
31 files changed, 183 insertions, 185 deletions
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 9c17ecea0191..83444ea0788c 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -24,14 +24,14 @@ class DetailsContainer { private: - Link m_aChangeHdl; + Link<> m_aChangeHdl; VclPtr<VclFrame> m_pFrame; public: DetailsContainer( VclBuilderContainer* pBuilder, const OString& rFrame ); virtual ~DetailsContainer( ); - void setChangeHdl( const Link& rLink ) { m_aChangeHdl = rLink; } + void setChangeHdl( const Link<>& rLink ) { m_aChangeHdl = rLink; } virtual void show( bool bShow = true ); virtual INetURLObject getUrl( ); diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index fea886db2a4e..070d980964c2 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -32,7 +32,7 @@ namespace svtools { class SVT_DLLPUBLIC AsynchronLink { - Link _aLink; + Link<> _aLink; ImplSVEvent * _nEventId; Idle* _pIdle; bool _bInCall; @@ -44,7 +44,7 @@ class SVT_DLLPUBLIC AsynchronLink SVT_DLLPRIVATE void Call_Impl( void* pArg ); public: - AsynchronLink( const Link& rLink ) + AsynchronLink( const Link<>& rLink ) : _aLink( rLink ) , _nEventId( 0 ) , _pIdle( 0 ) @@ -64,11 +64,11 @@ public: ~AsynchronLink(); void CreateMutex(); - void operator=( const Link& rLink ) { _aLink = rLink; } + void operator=( const Link<>& rLink ) { _aLink = rLink; } void Call( void* pObj, bool bAllowDoubles = false, bool bUseTimer = false ); void ClearPendingCall( ); bool IsSet() const { return _aLink.IsSet(); } - Link GetLink() const { return _aLink; } + Link<> GetLink() const { return _aLink; } }; } diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index ec6327656110..cc87c68ce50f 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -216,11 +216,11 @@ private: mbSelLeft:1, mbAllSel:1, mbDropPos:1; - Link maSelectionChangingHdl; - Link maDateRangeChangedHdl; - Link maRequestDateInfoHdl; - Link maDoubleClickHdl; - Link maSelectHdl; + Link<> maSelectionChangingHdl; + Link<> maDateRangeChangedHdl; + Link<> maRequestDateInfoHdl; + Link<> maDoubleClickHdl; + Link<> maSelectHdl; Timer maDragScrollTimer; sal_uInt16 mnDragScrollHitTest; @@ -320,16 +320,16 @@ public: Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; - void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; } - const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } - void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; } - const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } - void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; } - const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetSelectionChangingHdl( const Link<>& rLink ) { maSelectionChangingHdl = rLink; } + const Link<>& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } + void SetDateRangeChangedHdl( const Link<>& rLink ) { maDateRangeChangedHdl = rLink; } + const Link<>& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } + void SetRequestDateInfoHdl( const Link<>& rLink ) { maRequestDateInfoHdl = rLink; } + const Link<>& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } }; inline const Color& Calendar::GetStandardColor() const @@ -409,7 +409,7 @@ private: Date maDefaultDate; bool mbToday; bool mbNone; - Link maSelectHdl; + Link<> maSelectHdl; DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); @@ -437,8 +437,8 @@ public: void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } WinBits GetCalendarStyle() const { return mnCalendarStyle; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } protected: virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 5df3ae5350c0..e9af235b1203 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -31,11 +31,11 @@ namespace vcl { class Window; } class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::clipboard::XClipboardListener > { - Link aLink; + Link<> aLink; public: // Link is called with a TransferableDataHelper pointer - TransferableClipboardListener( const Link& rCallback ); + TransferableClipboardListener( const Link<>& rCallback ); virtual ~TransferableClipboardListener(); void AddRemoveListener( vcl::Window* pWin, bool bAdd ); diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 86d5dff1c7c9..8155ffa5fe1e 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -46,12 +46,12 @@ namespace svt The link must have the type: DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); */ - Link m_aDialogClosedLink; + Link<> m_aDialogClosedLink; public: DialogClosedListener(); - inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } + inline void SetDialogClosedLink( const Link<>& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index bd96141dc2f8..5fdfc3758b7b 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -111,7 +111,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const; - virtual void SetModifyHdl(const Link& rLink) = 0; + virtual void SetModifyHdl(const Link<>& rLink) = 0; virtual bool WantMouseEvent() const; }; @@ -146,7 +146,7 @@ namespace svt virtual void SetModified() = 0; virtual bool IsModified() const = 0; virtual void ClearModified() = 0; - virtual void SetModifyHdl( const Link& _rLink ) = 0; + virtual void SetModifyHdl( const Link<>& _rLink ) = 0; }; @@ -182,7 +182,7 @@ namespace svt virtual void SetModified() SAL_OVERRIDE; virtual bool IsModified() const SAL_OVERRIDE; virtual void ClearModified() SAL_OVERRIDE; - virtual void SetModifyHdl( const Link& _rLink ) SAL_OVERRIDE; + virtual void SetModifyHdl( const Link<>& _rLink ) SAL_OVERRIDE; }; #include <svtools/editimplementation.hxx> @@ -251,7 +251,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; }; @@ -271,7 +271,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; }; @@ -281,7 +281,7 @@ namespace svt { VclPtr<CheckBox> pBox; Rectangle aFocusRect; - Link m_aClickLink,m_aModifyLink; + Link<> m_aClickLink,m_aModifyLink; public: CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); @@ -296,11 +296,11 @@ namespace svt virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - void SetClickHdl(const Link& rHdl) {m_aClickLink = rHdl;} - const Link& GetClickHdl() const {return m_aClickLink;} + void SetClickHdl(const Link<>& rHdl) {m_aClickLink = rHdl;} + const Link<>& GetClickHdl() const {return m_aClickLink;} - void SetModifyHdl(const Link& rHdl) {m_aModifyLink = rHdl;} - const Link& GetModifyHdl() const {return m_aModifyLink;} + void SetModifyHdl(const Link<>& rHdl) {m_aModifyLink = rHdl;} + const Link<>& GetModifyHdl() const {return m_aModifyLink;} CheckBox& GetBox() {return *pBox;}; @@ -323,7 +323,7 @@ namespace svt virtual void ClearModified() SAL_OVERRIDE; protected: - virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; virtual bool WantMouseEvent() const SAL_OVERRIDE; }; @@ -357,7 +357,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; }; @@ -391,7 +391,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE; - virtual void SetModifyHdl(const Link& rLink) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE; }; diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index edf3e8f22369..4140388fcea4 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -136,7 +136,7 @@ void GenericEditImplementation< EDIT >::ClearModified() template <class EDIT> -void GenericEditImplementation< EDIT >::SetModifyHdl( const Link& _rLink ) +void GenericEditImplementation< EDIT >::SetModifyHdl( const Link<>& _rLink ) { m_rEdit.SetModifyHdl( _rLink ); } diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 20506dbd7b51..bc8c96a58a1a 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -60,7 +60,7 @@ private: OUString maButtonText; bool mbOpenDlg; - Link maDialogCreatedHdl; + Link<> maDialogCreatedHdl; FileControlMode mnFlags; FileControlMode_Internal mnInternalFlags; @@ -100,8 +100,8 @@ public: //use this to manipulate the dialog bevore executing it: - void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } - const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } + void SetDialogCreatedHdl( const Link<>& rLink ) { maDialogCreatedHdl = rLink; } + const Link<>& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } }; #endif diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 690efd1aa076..09affbebaf75 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -51,7 +51,7 @@ struct FileViewAsyncAction { sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned - Link aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result + Link<> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result FileViewAsyncAction() { @@ -157,9 +157,9 @@ public: void SetNoSelection(); - void SetSelectHdl( const Link& rHdl ); - void SetDoubleClickHdl( const Link& rHdl ); - void SetOpenDoneHdl( const Link& rHdl ); + void SetSelectHdl( const Link<>& rHdl ); + void SetDoubleClickHdl( const Link<>& rHdl ); + void SetOpenDoneHdl( const Link<>& rHdl ); sal_uLong GetSelectionCount() const; SvTreeListEntry* FirstSelected() const; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index b4913398d549..0c25f90bf587 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -184,7 +184,7 @@ private: GraphicType meType; GraphicManager* mpMgr; OUString maLink; - Link* mpSwapStreamHdl; + Link<>* mpSwapStreamHdl; OUString maUserData; Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; @@ -349,7 +349,7 @@ public: bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); - void SetSwapStreamHdl(const Link& rHdl); + void SetSwapStreamHdl(const Link<>& rHdl); sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } void FireSwapInRequest(); @@ -425,7 +425,7 @@ public: bool IsAnimated() const { return mbAnimated; } bool IsEPS() const { return mbEPS; } - Link GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); } + Link<> GetAnimationNotifyHdl() const { return GetGraphic().GetAnimationNotifyHdl(); } bool SwapOut(); bool SwapOut( SvStream* pOStm ); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 7ca5334044a6..0f411f264780 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -249,12 +249,12 @@ private: bool mbOutDrag; bool mbButtonStyle; bool mbItemMode; - Link maStartDragHdl; - Link maDragHdl; - Link maEndDragHdl; - Link maSelectHdl; - Link maDoubleClickHdl; - Link maCreateAccessibleHdl; + Link<> maStartDragHdl; + Link<> maDragHdl; + Link<> maEndDragHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; + Link<> maCreateAccessibleHdl; VCLXHeaderBar* m_pVCLXHeaderBar; @@ -348,18 +348,18 @@ public: inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } inline const OString& GetHelpId() const { return Window::GetHelpId(); } - inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } - inline const Link& GetStartDragHdl() const { return maStartDragHdl; } - inline void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } - inline const Link& GetDragHdl() const { return maDragHdl; } - inline void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } - inline const Link& GetEndDragHdl() const { return maEndDragHdl; } - inline void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - inline const Link& GetSelectHdl() const { return maSelectHdl; } - inline void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - inline const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; } - inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; } + inline void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; } + inline const Link<>& GetStartDragHdl() const { return maStartDragHdl; } + inline void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; } + inline const Link<>& GetDragHdl() const { return maDragHdl; } + inline void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; } + inline const Link<>& GetEndDragHdl() const { return maEndDragHdl; } + inline void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + inline const Link<>& GetSelectHdl() const { return maSelectHdl; } + inline void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + inline const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } + inline void SetCreateAccessibleHdl( const Link<>& rLink ) { maCreateAccessibleHdl = rLink; } + inline const Link<>& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; } inline bool IsDragable() const { return mbDragable; } diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 272dc98f80bd..156fb23baf25 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -32,7 +32,6 @@ #define HTML_CFG_MAX HTML_CFG_NS40 -class Link; struct HtmlOptions_Impl; class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index cdda74067bab..2ee42485b7df 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -38,7 +38,7 @@ namespace svt { protected: HyperLabelImpl* m_pImpl; - Link maClickHdl; + Link<> maClickHdl; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -69,8 +69,8 @@ namespace svt void ToggleBackgroundColor( const Color& _rGBColor ); void SetInteractive( bool _bInteractive ); - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } Size CalcMinimumSize( long nMaxWidth = 0 ) const; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 35a0893ec09f..47217f27e8f8 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -32,7 +32,7 @@ class SVT_DLLPUBLIC SvtURLBox : public ComboBox { friend class SvtMatchContext_Impl; friend class SvtURLBox_Impl; - Link aOpenHdl; + Link<> aOpenHdl; OUString aBaseURL; OUString aPlaceHolder; rtl::Reference< SvtMatchContext_Impl > pCtx; @@ -67,8 +67,8 @@ public: void SetBaseURL( const OUString& rURL ); const OUString& GetBaseURL() const { return aBaseURL; } - void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; } - const Link& GetOpenHdl() const { return aOpenHdl; } + void SetOpenHdl( const Link<>& rLink ) { aOpenHdl = rLink; } + const Link<>& GetOpenHdl() const { return aOpenHdl; } void SetOnlyDirectories( bool bDir = true ); void SetNoURLSelection( bool bSet = true ); INetProtocol GetSmartProtocol() const { return eSmartProtocol; } diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index a0699e67cbf9..ad8b30a5c278 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -227,9 +227,9 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control { friend class SvxIconChoiceCtrl_Impl; - Link _aClickIconHdl; - Link _aDocRectChangedHdl; - Link _aVisRectChangedHdl; + Link<> _aClickIconHdl; + Link<> _aDocRectChangedHdl; + Link<> _aVisRectChangedHdl; KeyEvent* _pCurKeyEvent; SvxIconChoiceCtrl_Impl* _pImp; bool _bAutoFontColor; @@ -278,8 +278,8 @@ public: void SetFont( const vcl::Font& rFont ); void SetPointFont( const vcl::Font& rFont ); - void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; } - const Link& GetClickHdl() const { return _aClickIconHdl; } + void SetClickHdl( const Link<>& rLink ) { _aClickIconHdl = rLink; } + const Link<>& GetClickHdl() const { return _aClickIconHdl; } using OutputDevice::SetBackground; void SetBackground( const Wallpaper& rWallpaper ); diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 75a44404da1e..064898d80084 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -22,6 +22,7 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> #include <tools/gen.hxx> +#include <tools/link.hxx> #include <osl/mutex.hxx> #include <unotools/options.hxx> @@ -32,7 +33,6 @@ is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ -class Link; class SvtMenuOptions_Impl; /*-************************************************************************************************************ @@ -58,8 +58,8 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options SvtMenuOptions(); virtual ~SvtMenuOptions(); - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); + void AddListenerLink( const Link<>& rLink ); + void RemoveListenerLink( const Link<>& rLink ); /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Menu/..." diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 4bff14906401..28cd67c9649b 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -21,6 +21,7 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> +#include <tools/link.hxx> #include <osl/mutex.hxx> #include <com/sun/star/uno/Sequence.h> #include <rtl/ustring.hxx> @@ -34,7 +35,6 @@ *//*-*************************************************************************************************************/ class SvtMiscOptions_Impl; -class Link; /*-************************************************************************************************************ @short collect information about misc group @@ -60,8 +60,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options SvtMiscOptions(); virtual ~SvtMiscOptions(); - void AddListenerLink( const Link& rLink ); - void RemoveListenerLink( const Link& rLink ); + void AddListenerLink( const Link<>& rLink ); + void RemoveListenerLink( const Link<>& rLink ); bool UseSystemFileDialog() const; void SetUseSystemFileDialog( bool bSet ); diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 62d430a053c3..33ae3657c4e2 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -71,7 +71,7 @@ public: virtual short Execute() SAL_OVERRIDE; - void SetOptionsHdl( const Link& rLink ); + void SetOptionsHdl( const Link<>& rLink ); }; diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 30cd11f89b91..f9fa6a3f9927 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -651,12 +651,12 @@ private: RulerSelection maHoverSelection; - Link maStartDragHdl; - Link maDragHdl; - Link maEndDragHdl; - Link maClickHdl; - Link maDoubleClickHdl; - Link maExtraDownHdl; + Link<> maStartDragHdl; + Link<> maDragHdl; + Link<> maEndDragHdl; + Link<> maClickHdl; + Link<> maDoubleClickHdl; + Link<> maExtraDownHdl; std::unique_ptr<RulerSelection> mxCurrentHitTest; std::unique_ptr<RulerSelection> mxPreviousHitTest; @@ -797,18 +797,18 @@ public: void SetStyle( WinBits nStyle ); WinBits GetStyle() const { return mnWinStyle; } - void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } - const Link& GetStartDragHdl() const { return maStartDragHdl; } - void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } - const Link& GetDragHdl() const { return maDragHdl; } - void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } - const Link& GetEndDragHdl() const { return maEndDragHdl; } - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; } - const Link& GetExtraDownHdl() const { return maExtraDownHdl; } + void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; } + const Link<>& GetStartDragHdl() const { return maStartDragHdl; } + void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; } + const Link<>& GetDragHdl() const { return maDragHdl; } + void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; } + const Link<>& GetEndDragHdl() const { return maEndDragHdl; } + void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } + const Link<>& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetExtraDownHdl( const Link<>& rLink ) { maExtraDownHdl = rLink; } + const Link<>& GetExtraDownHdl() const { return maExtraDownHdl; } void SetTextRTL(bool bRTL); bool GetTextRTL(); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 27208e5a63ba..90346fbba9b4 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -51,9 +51,9 @@ class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox private: SvSimpleTableContainer& m_rParentTableContainer; - Link aHeaderBarClickLink; - Link aHeaderBarDblClickLink; - Link aCommandLink; + Link<> aHeaderBarClickLink; + Link<> aHeaderBarDblClickLink; + Link<> aCommandLink; CommandEvent aCEvt; VclPtr<HeaderBar> aHeaderBar; long nOldPos; @@ -120,14 +120,14 @@ public: CommandEvent GetCommandEvent()const { return aCEvt;} inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } - void SetCommandHdl( const Link& rLink ) { aCommandLink = rLink; } - const Link& GetCommandHdl() const { return aCommandLink; } + void SetCommandHdl( const Link<>& rLink ) { aCommandLink = rLink; } + const Link<>& GetCommandHdl() const { return aCommandLink; } - void SetHeaderBarClickHdl( const Link& rLink ) { aHeaderBarClickLink = rLink; } - const Link& GetHeaderBarClickHdl() const { return aHeaderBarClickLink; } + void SetHeaderBarClickHdl( const Link<>& rLink ) { aHeaderBarClickLink = rLink; } + const Link<>& GetHeaderBarClickHdl() const { return aHeaderBarClickLink; } - void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } - const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } + void SetHeaderBarDblClickHdl( const Link<>& rLink ) { aHeaderBarDblClickLink = rLink; } + const Link<>& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } void SetHeaderBarHelpId(const OString& rHelpId) { aHeaderBar->SetHelpId(rHelpId); } diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx index 504db1f9b0c6..8628411e0810 100644 --- a/include/svtools/stdmenu.hxx +++ b/include/svtools/stdmenu.hxx @@ -101,8 +101,8 @@ class SVT_DLLPUBLIC FontNameMenu : public PopupMenu { private: OUString maCurName; - Link maSelectHdl; - Link maHighlightHdl; + Link<> maSelectHdl; + Link<> maHighlightHdl; public: FontNameMenu(); @@ -116,10 +116,10 @@ public: void SetCurName( const OUString& rName ); const OUString& GetCurName() const { return maCurName; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; } + const Link<>& GetHighlightHdl() const { return maHighlightHdl; } }; class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu @@ -127,8 +127,8 @@ class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu private: long* mpHeightAry; long mnCurHeight; - Link maSelectHdl; - Link maHighlightHdl; + Link<> maSelectHdl; + Link<> maHighlightHdl; public: FontSizeMenu(); @@ -142,10 +142,10 @@ public: void SetCurHeight( long nHeight ); long GetCurHeight() const { return mnCurHeight; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; } + const Link<>& GetHighlightHdl() const { return maHighlightHdl; } }; #endif // INCLUDED_SVTOOLS_STDMENU_HXX diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 8e9f6321a78b..a5e2ee29d855 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -59,7 +59,7 @@ struct SvLBoxButtonData_Impl; class SVT_DLLPUBLIC SvLBoxButtonData { private: - Link aLink; + Link<> aLink; long nWidth; long nHeight; SvLBoxButtonData_Impl* pImpl; @@ -80,8 +80,8 @@ public: static SvBmp GetIndex( SvItemStateFlags nItemState ); long Width(); long Height(); - void SetLink( const Link& rLink) { aLink=rLink; } - const Link& GetLink() const { return aLink; } + void SetLink( const Link<>& rLink) { aLink=rLink; } + const Link<>& GetLink() const { return aLink; } bool IsRadio(); // as buttons are not derived from LinkHdl void CallLink(); diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 575a51de0554..9fbd66fa21a0 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -135,7 +135,7 @@ public: inline bool IsParserWorking() const { return SVPAR_WORKING == eState; } - Link GetAsynchCallLink() const + Link<> GetAsynchCallLink() const { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); } long CallAsyncCallLink() { return NewDataRead( this, 0 ); } diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 1d7e54e56028..04e5207e1b40 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -350,9 +350,9 @@ private: bool mbHasInsertTab : 1; // if true, the tab bar has an extra tab at the end. bool mbScrollAlwaysEnabled : 1; - Link maSelectHdl; - Link maSplitHdl; - Link maScrollAreaContextHdl; + Link<> maSelectHdl; + Link<> maSplitHdl; + Link<> maScrollAreaContextHdl; size_t maCurrentItemList; using Window::ImplInit; @@ -508,9 +508,9 @@ public: Size CalcWindowSizePixel() const; - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - void SetScrollAreaContextHdl( const Link& rLink ) { maScrollAreaContextHdl = rLink; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } + void SetScrollAreaContextHdl( const Link<>& rLink ) { maScrollAreaContextHdl = rLink; } // accessibility virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 78d70890c58f..a65a8ef4d7a5 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -81,7 +81,7 @@ public: const Size& getMenuSize() const; - void SetSelectHdl( const Link& rLink ); + void SetSelectHdl( const Link<>& rLink ); int getSelectedEntryId() const; int getHighlightedEntryId() const; diff --git a/include/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx index c5368a5aeacc..5074195a8602 100644 --- a/include/svtools/toolpanelopt.hxx +++ b/include/svtools/toolpanelopt.hxx @@ -34,7 +34,6 @@ is faster and smaller then a complete implementation! */ class SvtToolPanelOptions_Impl; -class Link; /** collect information about sidebar group diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index de0d85c1c1c3..0c86721d7cd5 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -23,6 +23,7 @@ #include <svtools/svtdllapi.h> #include <tools/globname.hxx> #include <tools/gen.hxx> +#include <tools/link.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> #include <cppuhelper/implbase1.hxx> @@ -49,7 +50,6 @@ class INetBookmark; class INetImage; class FileList; namespace vcl { class Window; } -class Link; // Drag&Drop defines @@ -517,7 +517,7 @@ public: using TransferableHelper::StartDrag; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link& rCallbck, + const Link<>& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); }; diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 22689dcf844c..dfd6fbc146bf 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -72,8 +72,8 @@ class SVT_DLLPUBLIC SvTreeList ListViewsType aViewList; sal_uLong nEntryCount; - Link aCloneLink; - Link aCompareLink; + Link<> aCloneLink; + Link<> aCompareLink; SvSortMode eSortMode; sal_uInt16 nRefCount; @@ -218,10 +218,10 @@ public: // DECL_LINK(CloneHdl,SvTreeListEntry*); // The Handler needs to return a SvTreeListEntry* SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const; - void SetCloneLink( const Link& rLink ) + void SetCloneLink( const Link<>& rLink ) { aCloneLink=rLink; } - const Link& GetCloneLink() const + const Link<>& GetCloneLink() const { return aCloneLink; } SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link @@ -233,8 +233,8 @@ public: void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; } SvSortMode GetSortMode() const { return eSortMode; } sal_Int32 Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const; - void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; } - const Link& GetCompareHdl() const { return aCompareLink; } + void SetCompareHdl( const Link<>& rLink ) { aCompareLink = rLink; } + const Link<>& GetCompareHdl() const { return aCompareLink; } void Resort(); void Reverse(); }; diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 63318874f88c..45dce8ea8d51 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -246,12 +246,12 @@ class SVT_DLLPUBLIC SvTreeListBox SvTreeListBoxImpl* mpImpl; SvImpLBox* pImp; - Link aCheckButtonHdl; - Link aScrolledHdl; - Link aExpandedHdl; - Link aExpandingHdl; - Link aSelectHdl; - Link aDeselectHdl; + Link<> aCheckButtonHdl; + Link<> aScrolledHdl; + Link<> aExpandedHdl; + Link<> aExpandingHdl; + Link<> aSelectHdl; + Link<> aDeselectHdl; Accelerator aInpEditAcc; Image aPrevInsertedExpBmp; @@ -284,7 +284,7 @@ class SVT_DLLPUBLIC SvTreeListBox SvLBoxItem* pEdItem; protected: - Link aDoubleClickHdl; + Link<> aDoubleClickHdl; SvTreeListEntry* pTargetEntry; SvLBoxButtonData* pCheckButtonData; std::vector<SvLBoxTab*> aTabs; @@ -350,7 +350,7 @@ protected: // The Remove will be called from the handler, which then calls DragFinish. // The Remove is also called in the DTOR of the SvTreeListBox - // so it can't be called for a deleted object. - Link GetDragFinishedHdl() const; + Link<> GetDragFinishedHdl() const; // For asynchronous D'n'D sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox* pSourceView ); @@ -478,15 +478,15 @@ public: */ bool HandleKeyInput( const KeyEvent& rKEvt ); - void SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; } - void SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; } - void SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;} - const Link& GetSelectHdl() const { return aSelectHdl; } - const Link& GetDeselectHdl() const { return aDeselectHdl; } - const Link& GetDoubleClickHdl() const { return aDoubleClickHdl; } - void SetExpandingHdl(const Link& rNewHdl){aExpandingHdl=rNewHdl;} - void SetExpandedHdl(const Link& rNewHdl){aExpandedHdl=rNewHdl;} - const Link& GetExpandingHdl() const { return aExpandingHdl; } + void SetSelectHdl( const Link<>& rNewHdl ) {aSelectHdl=rNewHdl; } + void SetDeselectHdl( const Link<>& rNewHdl ) {aDeselectHdl=rNewHdl; } + void SetDoubleClickHdl(const Link<>& rNewHdl) {aDoubleClickHdl=rNewHdl;} + const Link<>& GetSelectHdl() const { return aSelectHdl; } + const Link<>& GetDeselectHdl() const { return aDeselectHdl; } + const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; } + void SetExpandingHdl(const Link<>& rNewHdl){aExpandingHdl=rNewHdl;} + void SetExpandedHdl(const Link<>& rNewHdl){aExpandedHdl=rNewHdl;} + const Link<>& GetExpandingHdl() const { return aExpandingHdl; } virtual void ExpandedHdl(); virtual bool ExpandingHdl(); @@ -610,8 +610,8 @@ protected: virtual void NotifyEndScroll(); virtual void NotifyScrolled(); - void SetScrolledHdl( const Link& rLink ) { aScrolledHdl = rLink; } - const Link& GetScrolledHdl() const { return aScrolledHdl; } + void SetScrolledHdl( const Link<>& rLink ) { aScrolledHdl = rLink; } + const Link<>& GetScrolledHdl() const { return aScrolledHdl; } long GetXOffset() const { return GetMapMode().GetOrigin().X(); } virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; @@ -693,8 +693,8 @@ public: static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ); static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ); - void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; } - Link GetCheckButtonHdl() const { return aCheckButtonHdl; } + void SetCheckButtonHdl( const Link<>& rLink ) { aCheckButtonHdl=rLink; } + Link<> GetCheckButtonHdl() const { return aCheckButtonHdl; } virtual void CheckButtonHdl(); void SetSublistOpenWithReturn( bool bMode = true ); // open/close sublist with return/enter @@ -830,7 +830,7 @@ struct SvLBoxDDInfo class SvInplaceEdit2 { - Link aCallBackHdl; + Link<> aCallBackHdl; Accelerator aAccReturn; Accelerator aAccEscape; Idle aIdle; @@ -845,7 +845,7 @@ class SvInplaceEdit2 public: SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, - const OUString& rData, const Link& rNotifyEditEnd, + const OUString& rData, const Link<>& rNotifyEditEnd, const Selection&, bool bMultiLine = false ); ~SvInplaceEdit2(); bool KeyInput( const KeyEvent& rKEvt ); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index a6ceb40665d5..330db02ec858 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -221,9 +221,9 @@ private: sal_uInt16 mnSpacing; sal_uInt16 mnFrameStyle; Color maColor; - Link maDoubleClickHdl; - Link maSelectHdl; - Link maHighlightHdl; + Link<> maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maHighlightHdl; // bitfield bool mbFormat : 1; @@ -374,12 +374,12 @@ public: Size CalcItemSizePixel( const Size& rSize, bool bOut = true ) const; long GetScrollWidth() const; - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetHighlightHdl( const Link& rLink ); + void SetHighlightHdl( const Link<>& rLink ); bool GetEdgeBlending() const { return mbEdgeBlending; } void SetEdgeBlending(bool bNew); diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 00f9d95b9db7..2aeca758cf68 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -208,8 +208,8 @@ private: VclPtr<vcl::Window> mpViewWindow; sal_uInt16 mnCurLevel; WindowAlign meViewAlign; - Link maActivateHdl; - Link maDeactivateHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; sal_Int16 mnLeftAlignCount; bool mbEmptyViewMargin; @@ -280,10 +280,10 @@ public: void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } - void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivatePageHdl() const { return maActivateHdl; } - void SetDeactivatePageHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivatePageHdl() const { return maDeactivateHdl; } + void SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivatePageHdl() const { return maActivateHdl; } + void SetDeactivatePageHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivatePageHdl() const { return maDeactivateHdl; } }; #endif // INCLUDED_SVTOOLS_WIZDLG_HXX |