diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
| commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
| tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include | |
| parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) | |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'include')
120 files changed, 814 insertions, 761 deletions
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index c0b84019e1f7..fbe8d1d4e855 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -54,8 +54,8 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener // Handler-Support: - Link aErrorHdl; // Error handler - Link aBreakHdl; // Breakpoint handler + Link<> aErrorHdl; // Error handler + Link<> aBreakHdl; // Breakpoint handler bool bNoRtl; // if true: do not search RTL bool bBreak; // if true: Break, otherwise Step bool bDocBasic; @@ -148,14 +148,14 @@ public: static SbError GetSfxFromVBError( sal_uInt16 nError ); bool IsBreak() const { return bBreak; } - static Link GetGlobalErrorHdl(); - static void SetGlobalErrorHdl( const Link& rNewHdl ); - Link GetErrorHdl() const { return aErrorHdl; } - void SetErrorHdl( const Link& r ) { aErrorHdl = r; } + static Link<> GetGlobalErrorHdl(); + static void SetGlobalErrorHdl( const Link<>& rNewHdl ); + Link<> GetErrorHdl() const { return aErrorHdl; } + void SetErrorHdl( const Link<>& r ) { aErrorHdl = r; } - static void SetGlobalBreakHdl( const Link& rNewHdl ); - Link GetBreakHdl() const { return aBreakHdl; } - void SetBreakHdl( const Link& r ) { aBreakHdl = r; } + static void SetGlobalBreakHdl( const Link<>& rNewHdl ); + Link<> GetBreakHdl() const { return aBreakHdl; } + void SetBreakHdl( const Link<>& r ) { aBreakHdl = r; } SbxArrayRef getUnoListeners(); diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx index 155630db7e06..789a3fed0d52 100644 --- a/include/dbaccess/AsynchronousLink.hxx +++ b/include/dbaccess/AsynchronousLink.hxx @@ -38,7 +38,7 @@ namespace dbaui */ class OAsynchronousLink { - Link m_aHandler; + Link<> m_aHandler; protected: ::osl::Mutex m_aEventSafety; @@ -49,7 +49,7 @@ namespace dbaui /** constructs the object @param _rHandler The link to be called asynchronously */ - OAsynchronousLink( const Link& _rHandler ); + OAsynchronousLink( const Link<>& _rHandler ); virtual ~OAsynchronousLink(); bool IsRunning() const { return m_nEventId != 0; } diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index b529d318dcd9..0dd5f5c23058 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -98,7 +98,7 @@ public: Color& GetColor() { return aColor; } void SetColor( const Color& rCol) { aColor = rCol; } - void SetDoneLink( const Link& rLink ); + void SetDoneLink( const Link<>& rLink ); SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 65c57db23329..4ead58f533c9 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -33,6 +33,7 @@ #include <i18nlangtag/lang.h> #include <tools/lineend.hxx> +#include <tools/link.hxx> #include <tools/rtti.hxx> #include <editeng/eedata.hxx> @@ -84,7 +85,6 @@ class Size; class Point; class Rectangle; class SvStream; -class Link; class OutputDevice; namespace vcl { class Window; } class SfxPoolItem; @@ -345,8 +345,8 @@ public: void SetModified(); bool IsModified() const; - void SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; + void SetModifyHdl( const Link<>& rLink ); + Link<> GetModifyHdl() const; bool IsInSelectionMode() const; @@ -368,14 +368,14 @@ public: sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); sal_uLong Write( SvStream& rOutput, EETextFormat ); - void SetStatusEventHdl( const Link& rLink ); - Link GetStatusEventHdl() const; + void SetStatusEventHdl( const Link<>& rLink ); + Link<> GetStatusEventHdl() const; - void SetNotifyHdl( const Link& rLink ); - Link GetNotifyHdl() const; + void SetNotifyHdl( const Link<>& rLink ); + Link<> GetNotifyHdl() const; - void SetImportHdl( const Link& rLink ); - Link GetImportHdl() const; + void SetImportHdl( const Link<>& rLink ); + Link<> GetImportHdl() const; // Do not evaluate font formatting => For Outliner bool IsFlatMode() const; @@ -464,10 +464,10 @@ public: CreateTransferable( const ESelection& rSelection ) const; // MT: Can't create new virtual functions like for ParagraphInserted/Deleted, musst be compatible in SRC638, change later... - void SetBeginMovingParagraphsHdl( const Link& rLink ); - void SetEndMovingParagraphsHdl( const Link& rLink ); - void SetBeginPasteOrDropHdl( const Link& rLink ); - void SetEndPasteOrDropHdl( const Link& rLink ); + void SetBeginMovingParagraphsHdl( const Link<>& rLink ); + void SetEndMovingParagraphsHdl( const Link<>& rLink ); + void SetBeginPasteOrDropHdl( const Link<>& rLink ); + void SetEndPasteOrDropHdl( const Link<>& rLink ); virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ); virtual void ParagraphInserted( sal_Int32 nNewParagraph ); @@ -519,12 +519,12 @@ public: static bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); } static bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable ); /** sets a link that is called at the beginning of a drag operation at an edit view */ - void SetBeginDropHdl( const Link& rLink ); - Link GetBeginDropHdl() const; + void SetBeginDropHdl( const Link<>& rLink ); + Link<> GetBeginDropHdl() const; /** sets a link that is called at the end of a drag operation at an edit view */ - void SetEndDropHdl( const Link& rLink ); - Link GetEndDropHdl() const; + void SetEndDropHdl( const Link<>& rLink ); + Link<> GetEndDropHdl() const; /// specifies if auto-correction should capitalize the first word or not (default is on) void SetFirstWordCapitalization( bool bCapitalize ); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index aec7f03c9939..bb091172c9ba 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -26,6 +26,7 @@ #include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <tools/gen.hxx> +#include <tools/link.hxx> #include <vcl/cursor.hxx> #include <editeng/editstat.hxx> #include <svl/languageoptions.hxx> @@ -44,7 +45,6 @@ class MouseEvent; class DropEvent; class CommandEvent; class Rectangle; -class Link; class Pair; class Point; class Range; @@ -213,7 +213,7 @@ public: bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); bool IsShapeParaFocusable(); bool WrongSpelledBreakPara(sal_Int32 nPara, sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex); - void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); + void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 ); void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index a767061454cb..01ff1ea7b9a6 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -20,6 +20,7 @@ #define INCLUDED_EDITENG_EDTDLG_HXX #include <rtl/ustring.hxx> +#include <tools/link.hxx> #include <editeng/editengdllapi.h> #include <i18nlangtag/lang.h> #include <com/sun/star/uno/Reference.hxx> @@ -34,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 namespace vcl { class Window; } class ResId; -class Link; class SvxSpellWrapper; class AbstractThesaurusDialog : public VclAbstractDialog @@ -60,14 +60,14 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog virtual void SetByCharacter( bool _bByCharacter ) = 0; virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; - virtual void SetOptionsChangedHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreHdl( const Link& _rHdl ) = 0; - virtual void SetIgnoreAllHdl( const Link& _rHdl ) = 0; - virtual void SetChangeHdl( const Link& _rHdl ) = 0; - virtual void SetChangeAllHdl( const Link& _rHdl ) = 0; - virtual void SetClickByCharacterHdl( const Link& _rHdl ) = 0; - virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) = 0; - virtual void SetFindHdl( const Link& _rHdl ) = 0; + virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) = 0; + virtual void SetIgnoreHdl( const Link<>& _rHdl ) = 0; + virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) = 0; + virtual void SetChangeHdl( const Link<>& _rHdl ) = 0; + virtual void SetChangeAllHdl( const Link<>& _rHdl ) = 0; + virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) = 0; + virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) = 0; + virtual void SetFindHdl( const Link<>& _rHdl ) = 0; virtual bool GetUseBothDirections() const= 0; virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 81fb3561575d..4b47caeb97ec 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -364,7 +364,7 @@ public: bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false ); bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); - void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); + void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 ); void SetInvalidateMore( sal_uInt16 nPixel ); sal_uInt16 GetInvalidateMore() const; @@ -589,22 +589,22 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster Paragraph* pHdlParagraph; sal_Int32 mnFirstSelPage; - Link aDrawPortionHdl; - Link aDrawBulletHdl; - Link aExpandHdl; - Link aParaInsertedHdl; - Link aParaRemovingHdl; - Link aDepthChangedHdl; - Link aWidthArrReqHdl; - Link aBeginMovingHdl; - Link aEndMovingHdl; - Link aIndentingPagesHdl; - Link aRemovingPagesHdl; - Link aFieldClickedHdl; - Link aCalcFieldValueHdl; - Link maPaintFirstLineHdl; - Link maBeginPasteOrDropHdl; - Link maEndPasteOrDropHdl; + Link<> aDrawPortionHdl; + Link<> aDrawBulletHdl; + Link<> aExpandHdl; + Link<> aParaInsertedHdl; + Link<> aParaRemovingHdl; + Link<> aDepthChangedHdl; + Link<> aWidthArrReqHdl; + Link<> aBeginMovingHdl; + Link<> aEndMovingHdl; + Link<> aIndentingPagesHdl; + Link<> aRemovingPagesHdl; + Link<> aFieldClickedHdl; + Link<> aCalcFieldValueHdl; + Link<> maPaintFirstLineHdl; + Link<> maBeginPasteOrDropHdl; + Link<> maEndPasteOrDropHdl; sal_Int32 nDepthChangedHdlPrevDepth; ParaFlag mnDepthChangeHdlPrevFlags; @@ -761,57 +761,57 @@ public: bool IsExpanding() const { return bIsExpanding; } void ExpandHdl(); - void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } - Link GetExpandHdl() const { return aExpandHdl; } + void SetExpandHdl( const Link<>& rLink ) { aExpandHdl = rLink; } + Link<> GetExpandHdl() const { return aExpandHdl; } void ParagraphInsertedHdl(); - void SetParaInsertedHdl(const Link& rLink){aParaInsertedHdl=rLink;} - Link GetParaInsertedHdl() const { return aParaInsertedHdl; } + void SetParaInsertedHdl(const Link<>& rLink){aParaInsertedHdl=rLink;} + Link<> GetParaInsertedHdl() const { return aParaInsertedHdl; } void ParagraphRemovingHdl(); - void SetParaRemovingHdl(const Link& rLink){aParaRemovingHdl=rLink;} - Link GetParaRemovingHdl() const { return aParaRemovingHdl; } + void SetParaRemovingHdl(const Link<>& rLink){aParaRemovingHdl=rLink;} + Link<> GetParaRemovingHdl() const { return aParaRemovingHdl; } void DepthChangedHdl(); - void SetDepthChangedHdl(const Link& rLink){aDepthChangedHdl=rLink;} - Link GetDepthChangedHdl() const { return aDepthChangedHdl; } + void SetDepthChangedHdl(const Link<>& rLink){aDepthChangedHdl=rLink;} + Link<> GetDepthChangedHdl() const { return aDepthChangedHdl; } sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } ParaFlag GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } bool RemovingPagesHdl( OutlinerView* ); - void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} - Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } + void SetRemovingPagesHdl(const Link<>& rLink){aRemovingPagesHdl=rLink;} + Link<> GetRemovingPagesHdl() const { return aRemovingPagesHdl; } long IndentingPagesHdl( OutlinerView* ); - void SetIndentingPagesHdl(const Link& rLink){aIndentingPagesHdl=rLink;} - Link GetIndentingPagesHdl() const { return aIndentingPagesHdl; } + void SetIndentingPagesHdl(const Link<>& rLink){aIndentingPagesHdl=rLink;} + Link<> GetIndentingPagesHdl() const { return aIndentingPagesHdl; } // valid only in the two upper handlers sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; } // valid only in the two upper handlers sal_Int32 GetFirstSelPage() const { return mnFirstSelPage; } - void SetCalcFieldValueHdl(const Link& rLink ) { aCalcFieldValueHdl= rLink; } - Link GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; } + void SetCalcFieldValueHdl(const Link<>& rLink ) { aCalcFieldValueHdl= rLink; } + Link<> GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; } - void SetFieldClickedHdl(const Link& rLink ) { aFieldClickedHdl= rLink; } - Link GetFieldClickedHdl() const { return aFieldClickedHdl; } + void SetFieldClickedHdl(const Link<>& rLink ) { aFieldClickedHdl= rLink; } + Link<> GetFieldClickedHdl() const { return aFieldClickedHdl; } - void SetDrawPortionHdl(const Link& rLink){aDrawPortionHdl=rLink;} - Link GetDrawPortionHdl() const { return aDrawPortionHdl; } + void SetDrawPortionHdl(const Link<>& rLink){aDrawPortionHdl=rLink;} + Link<> GetDrawPortionHdl() const { return aDrawPortionHdl; } - void SetDrawBulletHdl(const Link& rLink){aDrawBulletHdl=rLink;} - Link GetDrawBulletHdl() const { return aDrawBulletHdl; } + void SetDrawBulletHdl(const Link<>& rLink){aDrawBulletHdl=rLink;} + Link<> GetDrawBulletHdl() const { return aDrawBulletHdl; } - void SetPaintFirstLineHdl(const Link& rLink) { maPaintFirstLineHdl = rLink; } - Link GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; } + void SetPaintFirstLineHdl(const Link<>& rLink) { maPaintFirstLineHdl = rLink; } + Link<> GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; } - void SetModifyHdl( const Link& rLink ); - Link GetModifyHdl() const; + void SetModifyHdl( const Link<>& rLink ); + Link<> GetModifyHdl() const; - void SetNotifyHdl( const Link& rLink ); + void SetNotifyHdl( const Link<>& rLink ); - void SetStatusEventHdl( const Link& rLink ); - Link GetStatusEventHdl() const; + void SetStatusEventHdl( const Link<>& rLink ); + Link<> GetStatusEventHdl() const; void Draw( OutputDevice* pOutDev, const Rectangle& rOutRect ); void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); @@ -893,16 +893,16 @@ public: // Returns an array containing the widths of the Bullet Indentations // Last value must be -1. Is deleted by the outliner. - Link GetWidthArrReqHdl() const{ return aWidthArrReqHdl; } - void SetWidthArrReqHdl(const Link& rLink){aWidthArrReqHdl=rLink; } + Link<> GetWidthArrReqHdl() const{ return aWidthArrReqHdl; } + void SetWidthArrReqHdl(const Link<>& rLink){aWidthArrReqHdl=rLink; } void SetControlWord( EEControlBits nWord ); EEControlBits GetControlWord() const; - Link GetBeginMovingHdl() const { return aBeginMovingHdl; } - void SetBeginMovingHdl(const Link& rLink) {aBeginMovingHdl=rLink;} - Link GetEndMovingHdl() const {return aEndMovingHdl;} - void SetEndMovingHdl( const Link& rLink){aEndMovingHdl=rLink;} + Link<> GetBeginMovingHdl() const { return aBeginMovingHdl; } + void SetBeginMovingHdl(const Link<>& rLink) {aBeginMovingHdl=rLink;} + Link<> GetEndMovingHdl() const {return aEndMovingHdl;} + void SetEndMovingHdl( const Link<>& rLink){aEndMovingHdl=rLink;} sal_uLong GetLineCount( sal_Int32 nParagraph ) const; sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const; @@ -989,18 +989,18 @@ public: void ApplyChangedSentence(EditView& rEditView, const svx::SpellPortions& rNewPortions, bool bRecheck ); /** sets a link that is called at the beginning of a drag operation at an edit view */ - void SetBeginDropHdl( const Link& rLink ); + void SetBeginDropHdl( const Link<>& rLink ); /** sets a link that is called at the end of a drag operation at an edit view */ - void SetEndDropHdl( const Link& rLink ); + void SetEndDropHdl( const Link<>& rLink ); /** sets a link that is called before a drop or paste operation. */ - void SetBeginPasteOrDropHdl( const Link& rLink ); - Link GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; } + void SetBeginPasteOrDropHdl( const Link<>& rLink ); + Link<> GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; } /** sets a link that is called after a drop or paste operation. */ - void SetEndPasteOrDropHdl( const Link& rLink ); - Link GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } + void SetEndPasteOrDropHdl( const Link<>& rLink ); + Link<> GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; } sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index b9d8d8607773..cf4b02c15bbd 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -94,15 +94,15 @@ namespace sfx2 class SfxLinkItem : public SfxPoolItem { - Link aLink; + Link<> aLink; public: virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxLinkItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } - SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) + SfxLinkItem( sal_uInt16 nWhichId, const Link<>& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } - const Link& GetValue() const { return aLink; } + const Link<>& GetValue() const { return aLink; } }; #ifndef SFX_DECL_OBJECTSHELL_DEFINED diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 99feed27df20..9d5e507c8d60 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -167,7 +167,7 @@ struct SingleTabDlgImpl VclPtr<SfxTabPage> m_pSfxPage; VclPtr<FixedLine> m_pLine; OUString m_sInfoURL; - Link m_aInfoLink; + Link<> m_aInfoLink; SingleTabDlgImpl(); }; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index babea564b5df..ff40465676f0 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -438,7 +438,7 @@ private: SvNumberFormatter m_aNumberFormatter; Idle m_aEditLoseFocusIdle; Idle m_aBoxLoseFocusIdle; - Link m_aRemovedHdl; + Link<> m_aRemovedHdl; DECL_LINK( TypeHdl, CustomPropertiesTypeBox* ); DECL_LINK( RemoveHdl, CustomPropertiesRemoveButton* ); @@ -470,7 +470,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetCustomProperties() const; - void SetRemovedHdl( const Link& rLink ) { m_aRemovedHdl = rLink; } + void SetRemovedHdl( const Link<>& rLink ) { m_aRemovedHdl = rLink; } void InitRemoveButton(const ScrollBar &rScrollBar); void updateLineWidth(); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index f6f4fb16669c..389829fec857 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -135,8 +135,8 @@ public: const OUString& GetPhysicalName() const; SAL_WARN_UNUSED_RESULT bool IsRemote() const; SAL_WARN_UNUSED_RESULT bool IsOpen() const; // { return aStorage.Is() || pInStream; } - void Download( const Link& aLink = Link()); - void SetDoneLink( const Link& rLink ); + void Download( const Link<>& aLink = Link<>()); + void SetDoneLink( const Link<>& rLink ); sal_uInt32 GetErrorCode() const; sal_uInt32 GetError() const diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index 62d43deee264..95108a24b8d7 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC DocumentInserter private: OUString m_sDocFactory; OUString m_sFilter; - Link m_aDialogClosedLink; + Link<> m_aDialogClosedLink; sal_Int64 const m_nDlgFlags; ErrCode m_nError; @@ -55,7 +55,7 @@ public: bool const bEnableMultiSelection = false); ~DocumentInserter(); - void StartExecuteModal( const Link& _rDialogClosedLink ); + void StartExecuteModal( const Link<>& _rDialogClosedLink ); SfxMedium* CreateMedium(); SfxMediumList* CreateMediumList(); diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 6254094fc2a2..53a4fc3fafc5 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -92,7 +92,7 @@ public: }; private: - Link m_aDialogClosedLink; + Link<> m_aDialogClosedLink; ErrCode m_nError; ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp; @@ -131,7 +131,7 @@ public: virtual ~FileDialogHelper(); ErrCode Execute(); - void StartExecuteModal( const Link& rEndDialogHdl ); + void StartExecuteModal( const Link<>& rEndDialogHdl ); inline ErrCode GetError() const { return m_nError; } sal_Int16 GetDialogType() const; bool IsPasswordEnabled() const; diff --git a/include/sfx2/genlink.hxx b/include/sfx2/genlink.hxx index b9e23e5127e9..5c738e3dd902 100644 --- a/include/sfx2/genlink.hxx +++ b/include/sfx2/genlink.hxx @@ -25,13 +25,13 @@ typedef long (*CFuncPtr)(void*); class GenLink { - Link aLink; + Link<> aLink; CFuncPtr pFunc; public: GenLink(): pFunc(0) {} GenLink( CFuncPtr pCFunc ): pFunc(pCFunc) {} - GenLink( const Link& rLink ): aLink(rLink), pFunc(0) {} + GenLink( const Link<>& rLink ): aLink(rLink), pFunc(0) {} GenLink( const GenLink& rOrig ): aLink(rOrig.aLink), pFunc(rOrig.pFunc) {} diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index c39e5310ef67..0a2fbc163db3 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -85,7 +85,7 @@ public: virtual bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog - virtual void Edit( vcl::Window *, SvBaseLink *, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window *, SvBaseLink *, const Link<>& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 4b04b34eb4a9..3cac2f58934a 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -146,7 +146,7 @@ public: void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this - virtual void Edit( vcl::Window*, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window*, const Link<>& rEndEditHdl ); // should the link appear in the dialog? (to the left in the link in the...) bool IsVisible() const { return bVisible; } diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 799f7b40662e..0c91fab65ccd 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -79,7 +79,7 @@ public: class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog { public: - virtual void SetApplyHdl( const Link& rLink ) = 0; + virtual void SetApplyHdl( const Link<>& rLink ) = 0; }; class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 88a05b95ea30..6a4f18445159 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -207,14 +207,14 @@ public: void RemoveStandardButton(); short Execute() SAL_OVERRIDE; - void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; + void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE; void Start( bool bShow = true ); const SfxItemSet* GetExampleSet() const { return pExampleSet; } SfxItemSet* GetExampleSet() { return pExampleSet; } SfxViewFrame* GetViewFrame() const { return pFrame; } - void SetApplyHandler(const Link& _rHdl); + void SetApplyHandler(const Link<>& _rHdl); SAL_DLLPRIVATE void Start_Impl(); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 402d0c1df6e6..9de550e2b437 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -104,7 +104,7 @@ class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusList { bool m_bFloating; bool m_bCascading; - Link m_aDeleteLink; + Link<> m_aDeleteLink; sal_uInt16 m_nId; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; SfxFrameStatusListener* m_pStatusListener; @@ -157,7 +157,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void StartCascading(); - SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink ) + SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link<>& rLink ) { m_aDeleteLink = rLink; } diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index e7ce608606fd..d85e45a21f52 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -115,9 +115,9 @@ public: // Check if the root region is visible or not. bool isNonRootRegionVisible () const { return mnCurRegionId > 0;} - void setOpenRegionHdl(const Link &rLink); + void setOpenRegionHdl(const Link<> &rLink); - void setOpenTemplateHdl (const Link &rLink); + void setOpenTemplateHdl (const Link<> &rLink); static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height); @@ -141,8 +141,8 @@ protected: VclPtr<PushButton> maAllButton; VclPtr<FixedText> maFTName; - Link maOpenRegionHdl; - Link maOpenTemplateHdl; + Link<> maOpenRegionHdl; + Link<> maOpenTemplateHdl; }; #endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 913aed308a34..7a04eb2daef2 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -241,7 +241,7 @@ public: void sortItems (const boost::function<bool (const ThumbnailViewItem*, const ThumbnailViewItem*) > &func); - void setItemStateHdl (const Link &aLink) { maItemStateHdl = aLink; } + void setItemStateHdl (const Link<> &aLink) { maItemStateHdl = aLink; } virtual void Resize() SAL_OVERRIDE; @@ -329,7 +329,7 @@ protected: bool mbShowTooltips : 1; Color maColor; - Link maItemStateHdl; + Link<> maItemStateHdl; ThumbnailItemAttributes *mpItemAttrs; drawinglayer::processor2d::BaseProcessor2D *mpProcessor; boost::function<bool (const ThumbnailViewItem*) > maFilterFunc; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index a4c7bbcdb920..48238af77081 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -120,7 +120,7 @@ public: const Point& getPrev1Pos () const { return maPrev1Pos; } - void setSelectClickHdl (const Link &link); + void setSelectClickHdl (const Link<> &link); virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, const ThumbnailItemAttributes *pAttrs); @@ -136,7 +136,7 @@ protected: Point maTextPos; Point maPrev1Pos; Rectangle maDrawArea; - Link maClickHdl; + Link<> maClickHdl; bool mbEditTitle; VclPtr<VclMultiLineEdit> mpTitleED; Rectangle maTextEditMaxArea; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index e09884f1954e..f86245c69de6 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -61,13 +61,13 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } - void SetEndDockingHdl( const Link& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; } - const Link& GetEndDockingHdl() const { return m_aEndDockingHdl; } + void SetEndDockingHdl( const Link<>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; } + const Link<>& GetEndDockingHdl() const { return m_aEndDockingHdl; } /** resets the toolbox. Upon return, the only item in the toolbox is the closer. */ @@ -111,7 +111,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link<>& i_rCallback ); /** returns the current title. @@ -131,7 +131,7 @@ namespace sfx2 VclPtr<ToolBox> m_aToolbox; VclPtr<Window> m_aContentWindow; - Link m_aEndDockingHdl; + Link<> m_aEndDockingHdl; /** The border that is painted around the inner window. The bevel shadow lines are part of the border, so where the border is 0 no diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index f272b72b72ca..598aa3d7c384 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -98,8 +98,8 @@ protected: short nType; sal_IntPtr nId; sal_IntPtr nTime; - Link aData; - Link aDone; + Link<> aData; + Link<> aDone; bool bBusy; DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 ); @@ -112,11 +112,11 @@ public: void Execute(); - void SetDataHdl( const Link& rLink ) { aData = rLink; } - const Link& GetDataHdl() const { return aData; } + void SetDataHdl( const Link<>& rLink ) { aData = rLink; } + const Link<>& GetDataHdl() const { return aData; } - void SetDoneHdl( const Link& rLink ) { aDone = rLink; } - const Link& GetDoneHdl() const { return aDone; } + void SetDoneHdl( const Link<>& rLink ) { aDone = rLink; } + const Link<>& GetDoneHdl() const { return aDone; } void SetFormat( SotClipboardFormatId nFmt ) { aDdeData.SetFormat( nFmt ); } SotClipboardFormatId GetFormat() const { return aDdeData.GetFormat(); } @@ -138,14 +138,14 @@ private: class SVL_DLLPUBLIC DdeLink : public DdeTransaction { - Link aNotify; + Link<> aNotify; public: DdeLink( DdeConnection&, const OUString&, long = 0 ); virtual ~DdeLink(); - void SetNotifyHdl( const Link& rLink ) { aNotify = rLink; } - const Link& GetNotifyHdl() const { return aNotify; } + void SetNotifyHdl( const Link<>& rLink ) { aNotify = rLink; } + const Link<>& GetNotifyHdl() const { return aNotify; } virtual void Notify(); }; @@ -310,11 +310,11 @@ private: DdeString* pName; OUString aItem; std::vector<DdeItem*> aItems; - Link aConnectLink; - Link aDisconnectLink; - Link aGetLink; - Link aPutLink; - Link aExecLink; + Link<> aConnectLink; + Link<> aDisconnectLink; + Link<> aGetLink; + Link<> aPutLink; + Link<> aExecLink; public: DdeTopic( SAL_UNUSED_PARAMETER const OUString& ); @@ -323,16 +323,16 @@ public: const OUString GetName() const; long GetConvId(); - void SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; } - const Link& GetConnectHdl() const { return aConnectLink; } - void SetDisconnectHdl( const Link& rLink ) { aDisconnectLink = rLink; } - const Link& GetDisconnectHdl() const { return aDisconnectLink; } - void SetGetHdl( const Link& rLink ) { aGetLink = rLink; } - const Link& GetGetHdl() const { return aGetLink; } - void SetPutHdl( const Link& rLink ) { aPutLink = rLink; } - const Link& GetPutHdl() const { return aPutLink; } - void SetExecuteHdl( const Link& rLink ) { aExecLink = rLink; } - const Link& GetExecuteHdl() const { return aExecLink; } + void SetConnectHdl( const Link<>& rLink ) { aConnectLink = rLink; } + const Link<>& GetConnectHdl() const { return aConnectLink; } + void SetDisconnectHdl( const Link<>& rLink ) { aDisconnectLink = rLink; } + const Link<>& GetDisconnectHdl() const { return aDisconnectLink; } + void SetGetHdl( const Link<>& rLink ) { aGetLink = rLink; } + const Link<>& GetGetHdl() const { return aGetLink; } + void SetPutHdl( const Link<>& rLink ) { aPutLink = rLink; } + const Link<>& GetPutHdl() const { return aPutLink; } + void SetExecuteHdl( const Link<>& rLink ) { aExecLink = rLink; } + const Link<>& GetExecuteHdl() const { return aExecLink; } void NotifyClient( const OUString& ); bool IsSystemTopic(); diff --git a/include/svl/urihelper.hxx b/include/svl/urihelper.hxx index 7bfee23f6638..125234ea9921 100644 --- a/include/svl/urihelper.hxx +++ b/include/svl/urihelper.hxx @@ -51,7 +51,7 @@ namespace URIHelper { */ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef, OUString const & rTheRelURIRef, - Link const & rMaybeFileHdl = Link(), + Link<> const & rMaybeFileHdl = Link<>(), bool bCheckFileExists = true, bool bIgnoreFragment = false, INetURLObject::EncodeMechanism eEncodeMechanism = INetURLObject::WAS_ENCODED, @@ -60,9 +60,9 @@ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef, bool bRelativeNonURIs = false, INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); -SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); +SVL_DLLPUBLIC void SetMaybeFileHdl(Link<> const & rTheMaybeFileHdl); -SVL_DLLPUBLIC Link GetMaybeFileHdl(); +SVL_DLLPUBLIC Link<> GetMaybeFileHdl(); /** Converts a URI reference to a relative one, ignoring certain differences (for diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index f9a116b26f70..f4888015d6bd 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -338,7 +338,7 @@ public: ~SvNumberFormatter(); /// Set CallBack to ColorTable - void SetColorLink( const Link& rColorTableCallBack ); + void SetColorLink( const Link<>& rColorTableCallBack ); /// Do the CallBack to ColorTable Color* GetUserDefColor(sal_uInt16 nIndex); @@ -789,7 +789,7 @@ private: OnDemandNativeNumberWrapper xNatNum; // Native number service loaded on demand ImpSvNumberInputScan* pStringScanner; // Input string scanner ImpSvNumberformatScan* pFormatScanner; // Format code string scanner - Link aColorLink; // User defined color table CallBack + Link<> aColorLink; // User defined color table CallBack sal_uInt32 MaxCLOffset; // Max language/country offset used sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale LanguageType IniLnge; // Initialized setting language/country 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 diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index db9e95361a75..6423076a09eb 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -53,14 +53,14 @@ public: void SelectCharacter( sal_uInt32 cNew, bool bFocus = false ); sal_UCS4 GetSelectCharacter() const; - Link GetDoubleClickHdl() const { return aDoubleClkHdl; } - void SetDoubleClickHdl( const Link& rLink ) { aDoubleClkHdl = rLink; } - Link GetSelectHdl() const { return aSelectHdl; } - void SetSelectHdl( const Link& rHdl ) { aSelectHdl = rHdl; } - Link GetHighlightHdl() const { return aHighHdl; } - void SetHighlightHdl( const Link& rHdl ) { aHighHdl = rHdl; } - Link GetPreSelectHdl() const { return aHighHdl; } - void SetPreSelectHdl( const Link& rHdl ) { aPreSelectHdl = rHdl; } + Link<> GetDoubleClickHdl() const { return aDoubleClkHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClkHdl = rLink; } + Link<> GetSelectHdl() const { return aSelectHdl; } + void SetSelectHdl( const Link<>& rHdl ) { aSelectHdl = rHdl; } + Link<> GetHighlightHdl() const { return aHighHdl; } + void SetHighlightHdl( const Link<>& rHdl ) { aHighHdl = rHdl; } + Link<> GetPreSelectHdl() const { return aHighHdl; } + void SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; } static sal_uInt32& getSelectedChar(); svx::SvxShowCharSetItem* ImplGetItem( int _nPos ); @@ -100,10 +100,10 @@ protected: private: typedef std::map<sal_Int32, std::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap; ItemsMap m_aItems; - Link aDoubleClkHdl; - Link aSelectHdl; - Link aHighHdl; - Link aPreSelectHdl; + Link<> aDoubleClkHdl; + Link<> aSelectHdl; + Link<> aHighHdl; + Link<> aPreSelectHdl; svx::SvxShowCharSetVirtualAcc* m_pAccessible; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible; long nX; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 7b1e6ac9b6e5..07e05789a893 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -103,7 +103,7 @@ private: Image maEntryImage; OUString maEntryString; utl::TextSearch* pCommentSearcher; - Link aColCompareLink; + Link<> aColCompareLink; protected: @@ -161,8 +161,8 @@ public: virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; - void SetColCompareHdl(const Link& rLink ) { aColCompareLink = rLink; } - const Link& GetColCompareHdl() const { return aColCompareLink; } + void SetColCompareHdl(const Link<>& rLink ) { aColCompareLink = rLink; } + const Link<>& GetColCompareHdl() const { return aColCompareLink; } }; /// Tabpage with the filter text entries etc. @@ -170,13 +170,13 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPFilter: public TabPage { private: - Link aReadyLink; - Link aModifyLink; - Link aModifyDateLink; - Link aModifyAuthorLink; - Link aModifyRefLink; - Link aRefLink; - Link aModifyComLink; + Link<> aReadyLink; + Link<> aModifyLink; + Link<> aModifyDateLink; + Link<> aModifyAuthorLink; + Link<> aModifyRefLink; + Link<> aRefLink; + Link<> aModifyComLink; VclPtr<SvxRedlinTable> pRedlinTable; VclPtr<CheckBox> m_pCbDate; @@ -266,28 +266,28 @@ public: ListBox* GetLbAction() { return m_pLbAction;} - void SetReadyHdl( const Link& rLink ) { aReadyLink= rLink; } - const Link& GetReadyHdl() const { return aReadyLink; } + void SetReadyHdl( const Link<>& rLink ) { aReadyLink= rLink; } + const Link<>& GetReadyHdl() const { return aReadyLink; } - void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } - const Link& GetModifyHdl() const { return aModifyLink; } + void SetModifyHdl( const Link<>& rLink ) { aModifyLink = rLink; } + const Link<>& GetModifyHdl() const { return aModifyLink; } - void SetModifyDateHdl( const Link& rLink ) { aModifyDateLink = rLink; } - const Link& GetModifyDateHdl() const { return aModifyDateLink; } + void SetModifyDateHdl( const Link<>& rLink ) { aModifyDateLink = rLink; } + const Link<>& GetModifyDateHdl() const { return aModifyDateLink; } - void SetModifyAuthorHdl( const Link& rLink ) { aModifyAuthorLink = rLink; } - const Link& GetModifyAuthorHdl() const { return aModifyAuthorLink; } + void SetModifyAuthorHdl( const Link<>& rLink ) { aModifyAuthorLink = rLink; } + const Link<>& GetModifyAuthorHdl() const { return aModifyAuthorLink; } - void SetModifyCommentHdl(const Link& rLink ) { aModifyComLink = rLink; } - const Link& GetModifyCommentHdl() const { return aModifyComLink; } + void SetModifyCommentHdl(const Link<>& rLink ) { aModifyComLink = rLink; } + const Link<>& GetModifyCommentHdl() const { return aModifyComLink; } // Methods for Calc { - void SetModifyRangeHdl( const Link& rLink ) { aModifyRefLink = rLink; } - const Link& GetModifyRangeHdl() const { return aModifyRefLink; } + void SetModifyRangeHdl( const Link<>& rLink ) { aModifyRefLink = rLink; } + const Link<>& GetModifyRangeHdl() const { return aModifyRefLink; } - void SetRefHdl( const Link& rLink ) { aRefLink = rLink; } - const Link& GetRefHdl() const { return aRefLink; } + void SetRefHdl( const Link<>& rLink ) { aRefLink = rLink; } + const Link<>& GetRefHdl() const { return aRefLink; } void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ); @@ -299,11 +299,11 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxTPView : public TabPage { private: - Link AcceptClickLk; - Link AcceptAllClickLk; - Link RejectClickLk; - Link RejectAllClickLk; - Link UndoClickLk; + Link<> AcceptClickLk; + Link<> AcceptAllClickLk; + Link<> RejectClickLk; + Link<> RejectAllClickLk; + Link<> UndoClickLk; VclPtr<SvxRedlinTable> m_pViewData; VclPtr<PushButton> m_pAccept; @@ -345,20 +345,20 @@ public: void HideUndo() {ShowUndo(false);} bool IsUndoVisible(); - void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; } - const Link& GetAcceptClickHdl() const { return AcceptClickLk; } + void SetAcceptClickHdl( const Link<>& rLink ) { AcceptClickLk = rLink; } + const Link<>& GetAcceptClickHdl() const { return AcceptClickLk; } - void SetAcceptAllClickHdl( const Link& rLink ) { AcceptAllClickLk = rLink; } - const Link& GetAcceptAllClickHdl() const { return AcceptAllClickLk; } + void SetAcceptAllClickHdl( const Link<>& rLink ) { AcceptAllClickLk = rLink; } + const Link<>& GetAcceptAllClickHdl() const { return AcceptAllClickLk; } - void SetRejectClickHdl( const Link& rLink ) { RejectClickLk = rLink; } - const Link& GetRejectClickHdl() const { return RejectClickLk; } + void SetRejectClickHdl( const Link<>& rLink ) { RejectClickLk = rLink; } + const Link<>& GetRejectClickHdl() const { return RejectClickLk; } - void SetRejectAllClickHdl( const Link& rLink ) { RejectAllClickLk = rLink; } - const Link& GetRejectAllClickHdl() const { return RejectAllClickLk; } + void SetRejectAllClickHdl( const Link<>& rLink ) { RejectAllClickLk = rLink; } + const Link<>& GetRejectAllClickHdl() const { return RejectAllClickLk; } - void SetUndoClickHdl( const Link& rLink ) { UndoClickLk = rLink; } - const Link& GetUndoAllClickHdl() const { return UndoClickLk; } + void SetUndoClickHdl( const Link<>& rLink ) { UndoClickLk = rLink; } + const Link<>& GetUndoAllClickHdl() const { return UndoClickLk; } virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 13a182da1503..ef05aa0f4503 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -113,7 +113,7 @@ public: void SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces = 0); /** The passed handler is called whenever the totation value changes. */ - void SetModifyHdl( const Link& rLink ); + void SetModifyHdl( const Link<>& rLink ); /** Save value for later comparison */ void SaveValue(); @@ -127,7 +127,7 @@ protected: ScopedVclPtr<DialControlBmp> mxBmpEnabled; ScopedVclPtr<DialControlBmp> mxBmpDisabled; ScopedVclPtr<DialControlBmp> mxBmpBuffered; - Link maModifyHdl; + Link<> maModifyHdl; VclPtr<NumericField> mpLinkField; sal_Int32 mnLinkedFieldValueMultiplyer; Size maWinSize; @@ -156,7 +156,7 @@ protected: private: void InvalidateControl(); - void ImplSetFieldLink( const Link& rLink ); + void ImplSetFieldLink( const Link<>& rLink ); DECL_LINK( LinkedFieldModifyHdl, NumericField* ); diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 4d704d63814a..ca77be777db1 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -67,10 +67,10 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl { // Callback for interactive changes - Link maUserInteractiveChangeCallback; - Link maUserSelectionChangeCallback; - Link maChangeCallback; - Link maSelectionChangeCallback; + Link<> maUserInteractiveChangeCallback; + Link<> maUserSelectionChangeCallback; + Link<> maChangeCallback; + Link<> maSelectionChangeCallback; // lights sal_uInt32 maSelectedLight; @@ -113,10 +113,10 @@ public: virtual void SetObjectType(SvxPreviewObjectType nType) SAL_OVERRIDE; // register user callback - void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } - void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } - void SetChangeCallback(Link aNew) { maChangeCallback = aNew; } - void SetSelectionChangeCallback(Link aNew) { maSelectionChangeCallback = aNew; } + void SetUserInteractiveChangeCallback(Link<> aNew) { maUserInteractiveChangeCallback = aNew; } + void SetUserSelectionChangeCallback(Link<> aNew) { maUserSelectionChangeCallback = aNew; } + void SetChangeCallback(Link<> aNew) { maChangeCallback = aNew; } + void SetSelectionChangeCallback(Link<> aNew) { maSelectionChangeCallback = aNew; } // selection checks bool IsSelectionValid(); @@ -150,8 +150,8 @@ private: VclPtr<PushButton> maSwitcher; // callback for interactive changes - Link maUserInteractiveChangeCallback; - Link maUserSelectionChangeCallback; + Link<> maUserInteractiveChangeCallback; + Link<> maUserSelectionChangeCallback; public: SvxLightCtl3D(vcl::Window* pParent); @@ -169,8 +169,8 @@ public: Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl.get(); } // register user callback - void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } - void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } + void SetUserInteractiveChangeCallback(Link<> aNew) { maUserInteractiveChangeCallback = aNew; } + void SetUserSelectionChangeCallback(Link<> aNew) { maUserSelectionChangeCallback = aNew; } virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 01f91198d3cb..f68543095cff 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -130,7 +130,7 @@ public: bool IsActiveControl() const; void ForgetActiveControl(); - void SetControlActivationHandler( const Link& _rHdl ); + void SetControlActivationHandler( const Link<>& _rHdl ); virtual void Activate(bool bMDI) SAL_OVERRIDE; virtual void Deactivate(bool bMDI) SAL_OVERRIDE; diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index c94731e7d695..5bb785c4ea38 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -45,14 +45,14 @@ class FmSearchEngine; class SAL_WARN_UNUSED FmSearchThread : public ::osl::Thread { FmSearchEngine* m_pEngine; - Link m_aTerminationHdl; + Link<> m_aTerminationHdl; virtual void SAL_CALL run() SAL_OVERRIDE; virtual void SAL_CALL onTerminated() SAL_OVERRIDE; public: FmSearchThread(FmSearchEngine* pEngine) : m_pEngine(pEngine) { } - void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; } + void setTerminationHandler(Link<> aHdl) { m_aTerminationHdl = aHdl; } }; /** @@ -84,12 +84,12 @@ struct FmSearchProgress class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> { // attribute - Link m_lnkWhoWantsToKnow; + Link<> m_lnkWhoWantsToKnow; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xListening; // attribute access public: - Link SetPropChangeHandler(const Link& lnk); + Link<> SetPropChangeHandler(const Link<>& lnk); // methods public: @@ -211,7 +211,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FmSearchEngine SEARCH_RESULT m_srResult; // backward direction // The link we broadcast the progress and the result to - Link m_aProgressHandler; + Link<> m_aProgressHandler; bool m_bSearchingCurrently : 1; // is an (asynchronous) search running? bool m_bCancelAsynchRequest : 1; // should be cancelled? ::osl::Mutex m_aCancelAsynchAccess; // access to_bCancelAsynchRequest (technically only @@ -312,7 +312,7 @@ public: a FmSearchProgress structure the handler should be in any case thread-safe */ - void SetProgressHandler(Link aHdl) { m_aProgressHandler = aHdl; } + void SetProgressHandler(Link<> aHdl) { m_aProgressHandler = aHdl; } /// search for the next appearance (for nDirection values check DIRECTION_*-defines) void SearchNext(const OUString& strExpression); diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index bd262b3e5b5b..66f36f57e628 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -132,9 +132,9 @@ public: // frame border selection ------------------------------------------------- /** Returns the current selection handler. */ - const Link& GetSelectHdl() const; + const Link<>& GetSelectHdl() const; /** Sets the passed handler that is called if the selection of the control changes. */ - void SetSelectHdl( const Link& rHdl ); + void SetSelectHdl( const Link<>& rHdl ); /** Returns true, if the specified frame border is selected. */ bool IsBorderSelected( FrameBorderType eBorder ) const; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 71ca12449521..fa9f5dab4d52 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -118,7 +118,7 @@ class GalleryListView : public BrowseBox private: - Link maSelectHdl; + Link<> maSelectHdl; GalleryTheme* mpTheme; long mnCurRow; @@ -144,7 +144,7 @@ public: GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ); - void SetSelectHdl( const Link& rSelectHdl ) { maSelectHdl = rSelectHdl; } + void SetSelectHdl( const Link<>& rSelectHdl ) { maSelectHdl = rSelectHdl; } /** GetCellText returns the text at the given position @param _nRow diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index bc06735e2802..2597870a5153 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -178,7 +178,7 @@ public: bool IsDefault() const; SAL_DLLPRIVATE bool IsModified() const; - void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL ); + void Actualize( const Link<>& rActualizeLink, GalleryProgress* pProgress = NULL ); SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; } SAL_DLLPRIVATE Gallery* GetParent() const { return pParent; } diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index aff192e19e71..77fb49484a0e 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -39,10 +39,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control Graphic aGraphic; Idle aUpdateIdle; - Link aMousePosLink; - Link aGraphSizeLink; - Link aMarkObjLink; - Link aUpdateLink; + Link<> aMousePosLink; + Link<> aGraphSizeLink; + Link<> aMarkObjLink; + Link<> aUpdateLink; MapMode aMap100; Size aGraphSize; Point aMousePos; @@ -107,17 +107,17 @@ public: SdrObject* GetSelectedSdrObject() const; bool IsChanged() const { return bSdrMode && pModel->IsChanged(); } - void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; } - const Link& GetMousePosLink() const { return aMousePosLink; } + void SetMousePosLink( const Link<>& rLink ) { aMousePosLink = rLink; } + const Link<>& GetMousePosLink() const { return aMousePosLink; } - void SetGraphSizeLink( const Link& rLink ) { aGraphSizeLink = rLink; } - const Link& GetGraphSizeLink() const { return aGraphSizeLink; } + void SetGraphSizeLink( const Link<>& rLink ) { aGraphSizeLink = rLink; } + const Link<>& GetGraphSizeLink() const { return aGraphSizeLink; } - void SetMarkObjLink( const Link& rLink ) { aMarkObjLink = rLink; } - const Link& GetMarkObjLink() const { return aMarkObjLink; } + void SetMarkObjLink( const Link<>& rLink ) { aMarkObjLink = rLink; } + const Link<>& GetMarkObjLink() const { return aMarkObjLink; } - void SetUpdateLink( const Link& rLink ) { aUpdateLink = rLink; } - const Link& GetUpdateLink() const { return aUpdateLink; } + void SetUpdateLink( const Link<>& rLink ) { aUpdateLink = rLink; } + const Link<>& GetUpdateLink() const { return aUpdateLink; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index ec8ece737dfb..677e4c9e5595 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -220,8 +220,8 @@ public: private: vcl::Font m_aDefaultFont; - Link m_aMasterStateProvider; - Link m_aMasterSlotExecutor; + Link<> m_aMasterStateProvider; + Link<> m_aMasterSlotExecutor; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; @@ -478,13 +478,13 @@ public: const DbGridRowRef& GetCurrentRow() const {return m_xCurrentRow;} - void SetStateProvider(const Link& rProvider) { m_aMasterStateProvider = rProvider; } + void SetStateProvider(const Link<>& rProvider) { m_aMasterStateProvider = rProvider; } // if this link is set the given provider will be asked for the state of my items. // the return values are interpreted as follows : // <0 -> not specified (use default mechanism to determine the state) // ==0 -> the item is disabled // >0 -> the item is enabled - void SetSlotExecutor(const Link& rExecutor) { m_aMasterSlotExecutor = rExecutor; } + void SetSlotExecutor(const Link<>& rExecutor) { m_aMasterSlotExecutor = rExecutor; } // analogous : if this link is set, all nav-bar slots will be routed through it when executed // if the handler returns nonzero, no further handling of the slot occurs diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 89fbbded5221..daeb5928d091 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -43,7 +43,7 @@ private: OUString aOldPasswdErrStr; OUString aRepeatPasswdErrStr; - Link aCheckPasswordHdl; + Link<> aCheckPasswordHdl; bool bEmpty; @@ -58,7 +58,7 @@ public: OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } OUString GetNewPassword() const { return m_pNewPasswdED->GetText(); } - void SetCheckPasswordHdl( const Link& rLink ) { aCheckPasswordHdl = rLink; } + void SetCheckPasswordHdl( const Link<>& rLink ) { aCheckPasswordHdl = rLink; } }; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index f77bee62b94f..7729ab54449f 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -69,8 +69,8 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow class SvxRubyData_Impl; class RubyEdit : public Edit { - Link aScrollHdl; - Link aJumpHdl; + Link<> aScrollHdl; + Link<> aJumpHdl; virtual void GetFocus() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: @@ -82,8 +82,8 @@ public: : Edit(pParent, WB_BORDER) { } - void SetScrollHdl(Link& rLink) {aScrollHdl = rLink;} - void SetJumpHdl(Link& rLink) {aJumpHdl = rLink;} + void SetScrollHdl(Link<>& rLink) {aScrollHdl = rLink;} + void SetJumpHdl(Link<>& rLink) {aJumpHdl = rLink;} }; diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 1469642d6e30..96dc794997f8 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -30,7 +30,7 @@ private: using EditUndoManager::Undo; using EditUndoManager::Redo; - Link maEndTextEditHdl; + Link<> maEndTextEditHdl; SfxUndoAction* mpLastUndoActionBeforeTextEdit; bool mbEndTextEditTriggeredFromUndo; @@ -53,7 +53,7 @@ public: // activate (start text edit) and empty link to reset (end text edit). On // reset all text edit actions will be removed from this undo manager to // restore the state before activation - void SetEndTextEditHdl(const Link& rLink); + void SetEndTextEditHdl(const Link<>& rLink); // check from outside if we are inside a callback for ending text edit. This // is needed to detect inside end text edit if it is a regular one or triggered diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index ed0ce097989c..e422125e7242 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -74,7 +74,7 @@ protected: Rectangle aTextEditArea; Rectangle aMinTextEditArea; - Link aOldCalcFieldValueLink; // for call the old handler + Link<> aOldCalcFieldValueLink; // for call the old handler Point aMacroDownPos; sal_uInt16 nMacroTol; diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 1e47e180a53d..16453d8ad16a 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> +#include <tools/link.hxx> #include <tools/shl.hxx> #include <tools/fract.hxx> #include <vcl/outdev.hxx> @@ -119,10 +120,6 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl // man dann irgendwann mit delete platthauen muss. sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd); - - -class Link; - // Hilfsklasse zur kommunikation zwischen dem Dialog // zum aufbrechen von Metafiles (sd/source/ui/dlg/brkdlg.cxx), // SdrEditView::DoImportMarkedMtf() und @@ -142,10 +139,10 @@ private: sal_uIntPtr nObjCount; // Anzahl der selektierten Objekte sal_uIntPtr nCurObj; // Aktuelles Objekt - Link *pLink; + Link<> *pLink; public: - SvdProgressInfo( Link *_pLink ); + SvdProgressInfo( Link<> *_pLink ); void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ); @@ -175,19 +172,19 @@ public: class SdrLinkList { - std::vector<Link*> aList; + std::vector<Link<>*> aList; protected: - unsigned FindEntry(const Link& rLink) const; + unsigned FindEntry(const Link<>& rLink) const; public: SdrLinkList(): aList() {} ~SdrLinkList() { Clear(); } SVX_DLLPUBLIC void Clear(); unsigned GetLinkCount() const { return (unsigned)aList.size(); } - Link& GetLink(unsigned nNum) { return *aList[nNum]; } - const Link& GetLink(unsigned nNum) const { return *aList[nNum]; } - void InsertLink(const Link& rLink, unsigned nPos=0xFFFF); - void RemoveLink(const Link& rLink); - bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } + Link<>& GetLink(unsigned nNum) { return *aList[nNum]; } + const Link<>& GetLink(unsigned nNum) const { return *aList[nNum]; } + void InsertLink(const Link<>& rLink, unsigned nPos=0xFFFF); + void RemoveLink(const Link<>& rLink); + bool HasLink(const Link<>& rLink) const { return FindEntry(rLink)!=0xFFFF; } }; SdrLinkList& ImpGetUserMakeObjHdl(); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 22a55ed40e02..ce74428e219b 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -258,7 +258,7 @@ private: Color aMarkerColor; // callback link when value changed - Link aColorChangeHdl; + Link<> aColorChangeHdl; // use luminance values only bool bUseLuminance : 1; @@ -283,8 +283,8 @@ public: const Size& GetSize() const { return aMarkerSize; } void SetSize(const Size& rNew); - void SetColorChangeHdl(const Link& rLink) { aColorChangeHdl = rLink; } - const Link& GetColorChangeHdl() const { return aColorChangeHdl; } + void SetColorChangeHdl(const Link<>& rLink) { aColorChangeHdl = rLink; } + const Link<>& GetColorChangeHdl() const { return aColorChangeHdl; } }; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 5cd184e4640d..2248d4bebb7a 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -157,8 +157,8 @@ protected: DateTime aReadDate; // date of the incoming stream std::vector<SdrPage*> maMaPag; // master pages std::vector<SdrPage*> maPages; - Link aUndoLink; // link to a NotifyUndo-Handler - Link aIOProgressLink; + Link<> aUndoLink; // link to a NotifyUndo-Handler + Link<> aIOProgressLink; OUString aTablePath; Size aMaxObjSize; // e.g. for auto-growing text Fraction aObjUnit; // description of the coordinate units for ClipBoard, Drag&Drop, ... @@ -578,8 +578,8 @@ public: // void NotifyUndoActionHdl(SfxUndoAction* pUndoAction); // When calling the handler ownership is transferred; // The UndoAction belongs to the Handler, not the SdrModel. - void SetNotifyUndoActionHdl(const Link& rLink) { aUndoLink=rLink; } - const Link& GetNotifyUndoActionHdl() const { return aUndoLink; } + void SetNotifyUndoActionHdl(const Link<>& rLink) { aUndoLink=rLink; } + const Link<>& GetNotifyUndoActionHdl() const { return aUndoLink; } /** application can set its own undo manager, BegUndo, EndUndo and AddUndoAction calls are routet to this interface if given */ @@ -605,8 +605,8 @@ public: // Mind that the handler will also be called if the App serves Draw data in the // office wide Draw-Exchange-Format because that happens through streaming into // a MemoryStream. - void SetIOProgressHdl(const Link& rLink) { aIOProgressLink=rLink; } - const Link& GetIOProgressHdl() const { return aIOProgressLink; } + void SetIOProgressHdl(const Link<>& rLink) { aIOProgressLink=rLink; } + const Link<>& GetIOProgressHdl() const { return aIOProgressLink; } // Accessor methods for Palettes, Lists and Tabeles // FIXME: this badly needs re-factoring ... diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index e3d77ccae081..de32cf06ce7e 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -31,6 +31,7 @@ #include <svx/xenum.hxx> #include <svx/svxdllapi.h> #include <svx/shapeproperty.hxx> +#include <tools/link.hxx> #include <tools/weakbase.hxx> #include <tools/mapunit.hxx> #include <tools/gen.hxx> @@ -69,7 +70,6 @@ class SdrGluePointList; class SetOfByte; class OutputDevice; class Fraction; -class Link; namespace basegfx { @@ -1016,10 +1016,10 @@ private: public: static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); static SdrObject* MakeNewObject( sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ); - static void InsertMakeObjectHdl(const Link& rLink); - static void RemoveMakeObjectHdl(const Link& rLink); - static void InsertMakeUserDataHdl(const Link& rLink); - static void RemoveMakeUserDataHdl(const Link& rLink); + static void InsertMakeObjectHdl(const Link<>& rLink); + static void RemoveMakeObjectHdl(const Link<>& rLink); + static void InsertMakeUserDataHdl(const Link<>& rLink); + static void RemoveMakeUserDataHdl(const Link<>& rLink); }; typedef tools::WeakReference< SdrObject > SdrObjectWeakRef; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 1854f0248988..ebf3226e2129 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -178,7 +178,7 @@ class AbstractSvxNameDialog :public VclAbstractDialog { public: virtual void GetName( OUString& rName ) = 0; - virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; + virtual void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) = 0; virtual void SetEditHelpId(const OString&) = 0; //from class Window virtual void SetHelpId( const OString& ) = 0; @@ -189,7 +189,7 @@ class AbstractSvxObjectNameDialog :public VclAbstractDialog { public: virtual void GetName(OUString& rName) = 0; - virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) = 0; + virtual void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) = 0; }; class AbstractSvxObjectTitleDescDialog :public VclAbstractDialog @@ -223,8 +223,8 @@ public: class AbstractFmSearchDialog :public VclAbstractDialog { public: - virtual void SetFoundHandler(const Link& lnk) = 0; - virtual void SetCanceledNotFoundHdl(const Link& lnk)=0; + virtual void SetFoundHandler(const Link<>& lnk) = 0; + virtual void SetCanceledNotFoundHdl(const Link<>& lnk)=0; virtual void SetActiveField(const OUString& strField)=0; }; @@ -241,13 +241,13 @@ class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog { public: - virtual void SetValidateFramePosLink( const Link& rLink ) = 0; + virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0; }; class AbstractSvxCaptionDialog : public SfxAbstractTabDialog { public: - virtual void SetValidateFramePosLink( const Link& rLink ) = 0; + virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0; }; class AbstractSvxPostItDialog :public VclAbstractDialog @@ -255,8 +255,8 @@ class AbstractSvxPostItDialog :public VclAbstractDialog public: virtual void SetText( const OUString& rStr ) = 0; //From class Window virtual const SfxItemSet* GetOutputItemSet() const = 0; - virtual void SetPrevHdl( const Link& rLink ) = 0; - virtual void SetNextHdl( const Link& rLink ) = 0; + virtual void SetPrevHdl( const Link<>& rLink ) = 0; + virtual void SetNextHdl( const Link<>& rLink ) = 0; virtual void EnableTravel(bool bNext, bool bPrev) = 0; virtual OUString GetNote() = 0; virtual void SetNote(const OUString& rTxt) = 0; @@ -396,7 +396,7 @@ public: const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, - const Link& lnkContextSupplier)=0; + const Link<>& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource)=0; diff --git a/include/tools/line.hxx b/include/tools/line.hxx index c101e7567dbf..25356716337c 100644 --- a/include/tools/line.hxx +++ b/include/tools/line.hxx @@ -22,8 +22,6 @@ #include <tools/toolsdllapi.h> #include <tools/gen.hxx> -class Link; - class TOOLS_DLLPUBLIC Line { private: diff --git a/include/tools/link.hxx b/include/tools/link.hxx index 2dd0100096ba..99be32b754f8 100644 --- a/include/tools/link.hxx +++ b/include/tools/link.hxx @@ -76,21 +76,73 @@ SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *) #define LINK(Instance, Class, Member) \ - Link(static_cast<Class *>(Instance), &Class::LinkStub##Member) + Link<>(static_cast<Class *>(Instance), &Class::LinkStub##Member) + +#define DECL_LINK_TYPED(Member, ArgType, RetType) \ + static RetType LinkStub##Member(void *, ArgType); \ + RetType Member(ArgType) + +#define DECL_STATIC_LINK_TYPED(Class, Member, ArgType, RetType) \ + static RetType LinkStub##Member(void *, ArgType); \ + static RetType Member(Class *, ArgType) + +#define DECL_DLLPRIVATE_LINK_TYPED(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) \ + SAL_DLLPRIVATE static RetType LinkStub##Member(void *, ArgType); \ + SAL_DLLPRIVATE static RetType Member(Class *, ArgType) + +#define IMPL_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \ + RetType Class::LinkStub##Member(void * instance, ArgType) { \ + return static_cast<Class *>(instance)->Member(data); \ + } \ + RetType Class::Member(ArgType ArgName) + +#define IMPL_LINK_NOARG_TYPED(Class, Member, RetType) \ + RetType Class::LinkStub##Member(void * instance, void * data) { \ + return static_cast<Class *>(instance)->Member(data); \ + } \ + RetType Class::Member(SAL_UNUSED_PARAMETER void *) + +#define IMPL_STATIC_LINK_TYPED(Class, Member, ArgType, ArgName, RetType) \ + RetType Class::LinkStub##Member(void * instance, ArgType data) { \ + return Member(static_cast<Class *>(instance), data); \ + } \ + RetType Class::Member(Class * pThis, ArgType ArgName) + +#define IMPL_STATIC_LINK_NOINSTANCE_TYPED( \ + 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_NOINSTANCE_NOARG_TYPED(Class, Member, RetType) \ + RetType Class::LinkStub##Member(void * instance, void * data) { \ + return Member(static_cast<Class *>(instance), data); \ + } \ + RetType Class::Member( \ + SAL_UNUSED_PARAMETER Class *, SAL_UNUSED_PARAMETER void *) + +#define LINK_TYPED(Instance, Class, Member) tools::detail::makeLink( \ + static_cast<Class *>(Instance), &Class::LinkStub##Member) #define EMPTYARG +template<typename Arg = void *, typename Ret = sal_IntPtr> class TOOLS_DLLPUBLIC Link { public: - typedef sal_IntPtr Stub(void *, void *); + typedef Ret Stub(void *, Arg); Link(): function_(nullptr), instance_(nullptr) {} Link(void * instance, Stub * function): function_(function), instance_(instance) {} - sal_IntPtr Call(void * data) const - { return function_ == nullptr ? 0 : (*function_)(instance_, data); } + Ret Call(Arg data) const + { return function_ == nullptr ? Ret{} : (*function_)(instance_, data); } bool IsSet() const { return function_ != nullptr; } @@ -111,6 +163,15 @@ private: void * instance_; }; +namespace tools { namespace detail { + +template<typename Arg, typename Ret> +Link<Arg, Ret> makeLink(void * instance, Ret (* function)(void *, Arg)) { + return Link<Arg, Ret>(instance, function); +} + +} } + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index 9e1e1646c269..a41d7ec8d88c 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -164,8 +164,8 @@ public: This is needed because the number formatter isn't part of the svl light library, otherwise we could call SetDefaultSystemCurrency() directly. */ - static void SetCurrencyChangeLink( const Link& rLink ); - static const Link& GetCurrencyChangeLink(); + static void SetCurrencyChangeLink( const Link<>& rLink ); + static const Link<>& GetCurrencyChangeLink(); /** return the readonly state of the queried option. */ bool IsReadOnly( EOption eOption ) const; diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 2b31b1b1d348..8ac20a190434 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -20,11 +20,11 @@ #define INCLUDED_VCL_ABSTDLG_HXX #include <rtl/ustring.hxx> +#include <tools/link.hxx> #include <vcl/dllapi.h> namespace vcl { class Window; } class ResId; -class Link; class VCL_DLLPUBLIC VclAbstractDialog { @@ -39,7 +39,7 @@ class VCL_DLLPUBLIC VclAbstractDialog2 public: virtual ~VclAbstractDialog2(); - virtual void StartExecuteModal( const Link& rEndDialogHdl ) = 0; + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) = 0; virtual long GetResult() = 0; }; diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index d7d9d296ca2d..0459f04266b3 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -36,9 +36,9 @@ class VCL_DLLPUBLIC Accelerator : public Resource private: ImplAccelData* mpData; OUString maHelpStr; - Link maActivateHdl; - Link maDeactivateHdl; - Link maSelectHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; + Link<> maSelectHdl; // Will be set by AcceleratorManager vcl::KeyCode maCurKeyCode; @@ -89,12 +89,12 @@ public: void SetHelpText( const OUString& rHelpText ) { maHelpStr = rHelpText; } const OUString& GetHelpText() const { return maHelpStr; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return maDeactivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } Accelerator& operator=( const Accelerator& rAccel ); }; diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 17d62a1a3d1a..0d89bc9c4f1b 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -163,8 +163,8 @@ public: void SetCycleMode( CycleMode eMode ); CycleMode GetCycleMode() const { return meCycleMode; } - void SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; } - const Link& GetNotifyHdl() const { return maNotifyLink; } + void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; } + const Link<>& GetNotifyHdl() const { return maNotifyLink; } size_t Count() const { return maList.size(); } bool Insert( const AnimationBitmap& rAnimationBitmap ); @@ -196,7 +196,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation ); friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation ); @@ -216,7 +216,7 @@ private: std::vector< AnimationBitmap* > maList; std::vector< ImplAnimView* > maViewList; - Link maNotifyLink; + Link<> maNotifyLink; BitmapEx maBitmapEx; Timer maTimer; Size maGlobalSize; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 7d71a66fdc0d..9027a643deba 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -704,7 +704,7 @@ public: bool Vectorize( tools::PolyPolygon& rPolyPoly, sal_uLong nFlags = BMP_VECTORIZE_OUTER, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Convert the bitmap to a meta file @@ -731,7 +731,7 @@ public: GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, sal_uLong nFlags = BMP_VECTORIZE_INNER, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Change various global color characteristics @@ -789,7 +789,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); public: @@ -834,15 +834,15 @@ public: SAL_DLLPRIVATE bool ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* pFilterParam, - const Link* pProgress ); - - SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); + const Link<>* pProgress ); + + SAL_DLLPRIVATE bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplSepia( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); + SAL_DLLPRIVATE bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link<>* pProgress ); SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius = 0.7 ); SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius = 0.7 ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 1603f6f030c4..eb9e4d60a911 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -374,7 +374,7 @@ public: bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, - const Link* pProgress = NULL ); + const Link<>* pProgress = NULL ); /** Get transparency at given position diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index c7fdab639d1b..db29f241aa74 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -65,8 +65,8 @@ public: void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } sal_uInt16 GetFocusButton() const { return mnFocusButtonId; } - 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; } protected: ButtonDialog( WindowType nType ); @@ -84,7 +84,7 @@ private: sal_uInt16 mnCurButtonId; sal_uInt16 mnFocusButtonId; bool mbFormat; - Link maClickHdl; + Link<> maClickHdl; SAL_DLLPRIVATE void ImplInitButtonDialogData(); SAL_DLLPRIVATE PushButton* ImplCreatePushButton( sal_uInt16 nBtnFlags ); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 8fb9dedbfe65..8ecf063e0577 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -38,7 +38,7 @@ class VCL_DLLPUBLIC Button : public Control { private: std::unique_ptr<ImplCommonButtonData> mpButtonData; - Link maClickHdl; + Link<> maClickHdl; /// Command URL (like .uno:Save) in case the button should handle it. OUString maCommand; @@ -68,8 +68,8 @@ public: virtual void Click(); - 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; } /// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button. void SetCommandHandler(const OUString& aCommand); @@ -116,7 +116,7 @@ protected: sal_uInt16 mnDDStyle; bool mbPressed; bool mbInUserDraw; - Link maToggleHdl; + Link<> maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); @@ -195,8 +195,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; @@ -282,7 +282,7 @@ private: bool mbSaveValue; bool mbRadioCheck; bool mbStateChanged; - Link maToggleHdl; + Link<> maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement // occurs, otherwise the image ( radiobutton circle ) is placed @@ -373,8 +373,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } /** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group. @@ -411,7 +411,7 @@ private: TriState meState; TriState meSaveValue; bool mbTriState; - Link maToggleHdl; + Link<> maToggleHdl; // when mbLegacyNoTextAlign is set then the old behaviour where // the WB_LEFT, WB_RIGHT & WB_CENTER affect the image placement // occurs, otherwise the image ( checkbox box ) is placed @@ -485,8 +485,8 @@ public: Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } + void SetToggleHdl( const Link<>& rLink ) { maToggleHdl = rLink; } + const Link<>& GetToggleHdl() const { return maToggleHdl; } bool IsLegacyNoTextAlign() { return mbLegacyNoTextAlign; } void SetLegacyNoTextAlign( bool bVal ) { mbLegacyNoTextAlign = bVal; } diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index a835a40d215f..83e4a1812d4a 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -45,8 +45,8 @@ private: bool mbSyntheticModify : 1; bool mbMatchCase : 1; sal_Int32 m_nMaxWidthChars; - Link maSelectHdl; - Link maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; boost::signals2::scoped_connection mAutocompleteConnection; struct ComboBoxBounds @@ -163,10 +163,10 @@ public: void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; } sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; } - 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; } Size CalcMinimumSize() const SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index f3fd7026472b..7c3c9e69c9cc 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -41,8 +41,8 @@ protected: private: bool mbHasControlFocus; - Link maGetFocusHdl; - Link maLoseFocusHdl; + Link<> maGetFocusHdl; + Link<> maLoseFocusHdl; SAL_DLLPRIVATE void ImplInitControlData(); @@ -79,7 +79,7 @@ protected: if the Control instance has been destroyed in any of the call */ bool ImplCallEventListenersAndHandler( - sal_uLong nEvent, const Link& rHandler, void* pCaller + sal_uLong nEvent, const Link<>& rHandler, void* pCaller ); /** draws the given text onto the given device @@ -163,10 +163,10 @@ public: */ long ToRelativeLineIndex( long nIndex ) const; - void SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; } - const Link& GetGetFocusHdl() const { return maGetFocusHdl; } - void SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; } - const Link& GetLoseFocusHdl() const { return maLoseFocusHdl; } + void SetGetFocusHdl( const Link<>& rLink ) { maGetFocusHdl = rLink; } + const Link<>& GetGetFocusHdl() const { return maGetFocusHdl; } + void SetLoseFocusHdl( const Link<>& rLink ) { maLoseFocusHdl = rLink; } + const Link<>& GetLoseFocusHdl() const { return maLoseFocusHdl; } /** determines whether the control currently has the focus */ diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index 254d887b7251..a714b227c69d 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -35,7 +35,7 @@ class VCL_DLLPUBLIC GraphicConverter { private: - Link maFilterHdl; + Link<> maFilterHdl; ConvertData* mpConvertData; public: @@ -48,8 +48,8 @@ public: ConvertData* GetConvertData() { return mpConvertData; } - void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; } - const Link& GetFilterHdl() const { return maFilterHdl; } + void SetFilterHdl( const Link<>& rLink ) { maFilterHdl = rLink; } + const Link<>& GetFilterHdl() const { return maFilterHdl; } }; #endif // INCLUDED_VCL_CVTGRF_HXX diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 652a06965e27..0587aefb7b3e 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -101,7 +101,7 @@ public: // Dialog::Execute replacement API public: // Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended - virtual void StartExecuteModal( const Link& rEndDialogHdl ); + virtual void StartExecuteModal( const Link<>& rEndDialogHdl ); long GetResult() const; private: bool ImplStartExecuteModal(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index dde925f47051..3eb655ccd09b 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -94,8 +94,8 @@ private: mbIsSubEdit:1, mbInMBDown:1, mbActivePopup:1; - Link maModifyHdl; - Link maUpdateDataHdl; + Link<> maModifyHdl; + Link<> maUpdateDataHdl; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; @@ -233,9 +233,9 @@ public: const OUString& GetSavedValue() const { return maSaveValue; } bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); } - virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } - virtual const Link& GetModifyHdl() const { return maModifyHdl; } - virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } + virtual void SetModifyHdl( const Link<>& rLink ) { maModifyHdl = rLink; } + virtual const Link<>& GetModifyHdl() const { return maModifyHdl; } + virtual void SetUpdateDataHdl( const Link<>& rLink ) { maUpdateDataHdl = rLink; } void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx index 86b38f69253d..e98ec15398e8 100644 --- a/include/vcl/evntpost.hxx +++ b/include/vcl/evntpost.hxx @@ -36,12 +36,12 @@ namespace vcl class VCL_DLLPUBLIC EventPoster { ImplSVEvent * m_nId; - Link m_aLink; + Link<> m_aLink; DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* ); public: - EventPoster( const Link& rLink ); + EventPoster( const Link<>& rLink ); ~EventPoster(); void Post( UserEvent* pEvent ); }; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index cdc80d9cd31c..dc461b781771 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -43,7 +43,7 @@ class VCL_DLLPUBLIC FormatterBase private: VclPtr<Edit> mpField; LocaleDataWrapper* mpLocaleDataWrapper; - Link maErrorLink; + Link<> maErrorLink; bool mbReformat; bool mbStrictFormat; bool mbEmptyFieldValue; @@ -83,8 +83,8 @@ public: const AllSettings& GetFieldSettings() const; - void SetErrorHdl( const Link& rLink ) { maErrorLink = rLink; } - const Link& GetErrorHdl() const { return maErrorLink; } + void SetErrorHdl( const Link<>& rLink ) { maErrorLink = rLink; } + const Link<>& GetErrorHdl() const { return maErrorLink; } void SetEmptyFieldValue(); bool IsEmptyFieldValue() const; @@ -229,7 +229,7 @@ protected: OUString maCurUnitText; sal_Int64 mnBaseValue; FieldUnit meUnit; - Link maCustomConvertLink; + Link<> maCustomConvertLink; protected: MetricFormatter(); @@ -270,8 +270,8 @@ public: using NumericFormatter::GetCorrectedValue; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; - void SetCustomConvertHdl( const Link& rLink ) { maCustomConvertLink = rLink; } - const Link& GetCustomConvertHdl() const { return maCustomConvertLink; } + void SetCustomConvertHdl( const Link<>& rLink ) { maCustomConvertLink = rLink; } + const Link<>& GetCustomConvertHdl() const { return maCustomConvertLink; } }; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 2fc8e2f95469..8af5860bcf4c 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -28,7 +28,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText private: long m_nTextLen; Pointer m_aOldPointer; - Link m_aClickHdl; + Link<> m_aClickHdl; OUString m_sURL; /** initializes the font (link color and underline). @@ -91,14 +91,14 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText m_aClickHdl is called if the text is clicked. */ - inline void SetClickHdl( const Link& rLink ) { m_aClickHdl = rLink; } + inline void SetClickHdl( const Link<>& rLink ) { m_aClickHdl = rLink; } /** returns m_aClickHdl. @return m_aClickHdl */ - inline const Link& GetClickHdl() const { return m_aClickHdl; } + inline const Link<>& GetClickHdl() const { return m_aClickHdl; } // ::FixedHyperbaseLink diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index a9033a22670b..fb542ddffb06 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -89,7 +89,7 @@ private: bool mbOldSaveBackMode; bool mbGrabFocus; // act as key input window, although focus is not set bool mbInCleanUp; - Link maPopupModeEndHdl; + Link<> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); @@ -144,8 +144,8 @@ public: bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } - void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } - const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } + void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; } + const Link<>& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } bool GrabsFocus() const { return mbGrabFocus; } diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index e860dda464b1..43bfad95a0b6 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -78,7 +78,7 @@ private: MapMode aPrefMapMode; Size aPrefSize; - Link aHookHdlLink; + Link<> aHookHdlLink; GDIMetaFile* pPrev; GDIMetaFile* pNext; VclPtr<OutputDevice> pOutDev; @@ -198,8 +198,8 @@ public: const MapMode& GetPrefMapMode() const { return aPrefMapMode; } void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } - void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } - const Link& GetHookHdl() const { return aHookHdlLink; } + void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; } + const Link<>& GetHookHdl() const { return aHookHdlLink; } sal_uLong GetChecksum() const; sal_uLong GetSizeBytes() const; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 1111dd46d533..778c6719c4c7 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -158,8 +158,8 @@ public: void StopAnimation( OutputDevice* pOutputDevice = NULL, long nExtraData = 0L ); - void SetAnimationNotifyHdl( const Link& rLink ); - Link GetAnimationNotifyHdl() const; + void SetAnimationNotifyHdl( const Link<>& rLink ); + Link<> GetAnimationNotifyHdl() const; sal_uLong GetAnimationLoopCount() const; diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 5249d73600e5..44511930ec0b 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -315,7 +315,7 @@ public: const FilterErrorEx& GetLastError() const { return *pErrorEx;} void ResetLastError(); - const Link GetFilterCallback() const; + const Link<> GetFilterCallback() const; static GraphicFilter& GetGraphicFilter(); static int LoadGraphic( const OUString& rPath, const OUString& rFilter, Graphic& rGraphic, diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx index 9cb734546fb0..64cd9674f383 100644 --- a/include/vcl/idle.hxx +++ b/include/vcl/idle.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC Idle : public Scheduler { protected: - Link maIdleHdl; // Callback Link + Link<> maIdleHdl; // Callback Link public: Idle(); @@ -34,8 +34,8 @@ public: /// Make it possible to associate a callback with this idle handler /// of course, you can also sub-class and override 'Invoke' - void SetIdleHdl( const Link& rLink ) { maIdleHdl = rLink; } - const Link& GetIdleHdl() const { return maIdleHdl; } + void SetIdleHdl( const Link<>& rLink ) { maIdleHdl = rLink; } + const Link<>& GetIdleHdl() const { return maIdleHdl; } virtual void Invoke() SAL_OVERRIDE; Idle& operator=( const Idle& rIdle ); }; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index bec9976a7317..85c613919020 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -544,15 +544,15 @@ public: return m_pDisclosureButton->GetText(); } virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; - void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; } - const Link& GetExpandedHdl() const { return maExpandedHdl; } + void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; } + const Link<>& GetExpandedHdl() const { return maExpandedHdl; } protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; private: bool m_bResizeTopLevel; VclPtr<DisclosureButton> m_pDisclosureButton; - Link maExpandedHdl; + Link<> maExpandedHdl; DECL_DLLPRIVATE_LINK(ClickHdl, DisclosureButton* pBtn); }; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 5647f974f396..bd13541337c3 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -44,8 +44,8 @@ private: sal_uInt16 mnDDHeight; sal_Int32 mnSaveValue; sal_Int32 m_nMaxWidthChars; - Link maSelectHdl; - Link maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; sal_uInt16 mnLineCount; /// bitfield @@ -190,10 +190,10 @@ public: void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false ); - 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; } Size CalcSubEditSize() const; //size of area inside lstbox, i.e. no scrollbar/dropdown Size CalcMinimumSize() const; //size of lstbox area, i.e. including scrollbar/dropdown diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 32dfd5a73d28..2af6a530cb27 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -126,10 +126,10 @@ private: Menu* pStartedFrom; VclPtr<vcl::Window> pWindow; - Link aActivateHdl; // Active-Handler - Link aDeactivateHdl; // Deactivate-Handler - Link aHighlightHdl; // Highlight-Handler - Link aSelectHdl; // Highlight-Handler + Link<> aActivateHdl; // Active-Handler + Link<> aDeactivateHdl; // Deactivate-Handler + Link<> aHighlightHdl; // Highlight-Handler + Link<> aSelectHdl; // Highlight-Handler VclEventListeners maEventListeners; VclEventListeners maChildEventListeners; @@ -320,24 +320,24 @@ public: void SetHelpId( sal_uInt16 nItemId, const OString& rHelpId ); OString GetHelpId( sal_uInt16 nItemId ) const; - void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } - const Link& GetActivateHdl() const { return aActivateHdl; } + void SetActivateHdl( const Link<>& rLink ) { aActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return aActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { aDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return aDeactivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { aDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return aDeactivateHdl; } - void SetHighlightHdl( const Link& rLink ) { aHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return aHighlightHdl; } + void SetHighlightHdl( const Link<>& rLink ) { aHighlightHdl = rLink; } + const Link<>& GetHighlightHdl() const { return aHighlightHdl; } - void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } - const Link& GetSelectHdl() const { return aSelectHdl; } + void SetSelectHdl( const Link<>& rLink ) { aSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return aSelectHdl; } bool HasLogo() const { return pLogo != nullptr; } - void AddEventListener( const Link& rEventListener ); - void RemoveEventListener( const Link& rEventListener ); - void AddChildEventListener( const Link& rEventListener ); - void RemoveChildEventListener( const Link& rEventListener ); + void AddEventListener( const Link<>& rEventListener ); + void RemoveEventListener( const Link<>& rEventListener ); + void AddChildEventListener( const Link<>& rEventListener ); + void RemoveChildEventListener( const Link<>& rEventListener ); Menu& operator =( const Menu& rMenu ); @@ -393,9 +393,9 @@ namespace vcl class VCL_DLLPUBLIC MenuBar : public Menu { - Link maCloseHdl; - Link maFloatHdl; - Link maHideHdl; + Link<> maCloseHdl; + Link<> maFloatHdl; + Link<> maHideHdl; bool mbCloseBtnVisible; bool mbFloatBtnVisible; bool mbHideBtnVisible; @@ -447,12 +447,12 @@ public: bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const; bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId); - void SetCloseButtonClickHdl( const Link& rLink ) { maCloseHdl = rLink; } - const Link& GetCloseButtonClickHdl() const { return maCloseHdl; } - void SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; } - const Link& GetFloatButtonClickHdl() const { return maFloatHdl; } - void SetHideButtonClickHdl( const Link& rLink ) { maHideHdl = rLink; } - const Link& GetHideButtonClickHdl() const { return maHideHdl; } + void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; } + const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; } + void SetFloatButtonClickHdl( const Link<>& rLink ) { maFloatHdl = rLink; } + const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; } + void SetHideButtonClickHdl( const Link<>& rLink ) { maHideHdl = rLink; } + const Link<>& GetHideButtonClickHdl() const { return maHideHdl; } // - by default a menubar is displayable // - if a menubar is not displayable, its MenuBarWindow will never be shown @@ -470,11 +470,11 @@ public: // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press // passed string will be set as tooltip - sal_uInt16 AddMenuBarButton( const Image&, const Link&, const OUString&, sal_uInt16 nPos = 0 ); + sal_uInt16 AddMenuBarButton( const Image&, const Link<>&, const OUString&, sal_uInt16 nPos = 0 ); // set the highlight link for additional button with ID nId // highlight link will be called with a MenuBarButtonHighlightArg // the bHighlight member of that struct shall contain the new state - void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& ); + void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link<>& ); // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindiow the menubar is attached to // if the menubar is unattached an empty rectangle is returned diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index eb2c446a4a53..ffeaa19919bc 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -41,8 +41,8 @@ private: PopupMenu* mpMenu; sal_uInt16 mnCurItemId; sal_uInt16 mnMenuMode; - Link maActivateHdl; - Link maSelectHdl; + Link<> maActivateHdl; + Link<> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); @@ -77,10 +77,10 @@ public: OString GetCurItemIdent() const; void SetCurItemId( sal_uInt16 nItemId ) { mnCurItemId = nItemId; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } }; #endif // INCLUDED_VCL_MENUBTN_HXX diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index be18fd06bb6a..e6d3b28c1638 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -227,7 +227,7 @@ private: bool mbInPrintPage; bool mbNewJobSetup; bool mbIsQueuePrinter; - Link maErrorHdl; + Link<> maErrorHdl; SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); @@ -372,8 +372,8 @@ public: sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); } sal_uLong GetErrorCode() const { return mnError; } - void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } - const Link& GetErrorHdl() const { return maErrorHdl; } + void SetErrorHdl( const Link<>& rLink ) { maErrorHdl = rLink; } + const Link<>& GetErrorHdl() const { return maErrorHdl; } /** checks the printer list and updates it necessary * @@ -552,7 +552,7 @@ public: VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); VCL_PLUGIN_PUBLIC void printFilteredPage( int i_nPage ); SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& ); - SAL_DLLPRIVATE void setOptionChangeHdl( const Link& ); + SAL_DLLPRIVATE void setOptionChangeHdl( const Link<>& ); VCL_PLUGIN_PUBLIC void createProgressDialog(); VCL_PLUGIN_PUBLIC bool isProgressCanceled() const; SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 3a16f9e4359e..71bda7168c3b 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -65,8 +65,8 @@ private: ScrollType meDDScrollType; bool mbCalcSize; bool mbFullDrag; - Link maScrollHdl; - Link maEndScrollHdl; + Link<> maScrollHdl; + Link<> maEndScrollHdl; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; @@ -134,10 +134,10 @@ public: long GetDelta() const { return mnDelta; } ScrollType GetType() const { return meScrollType; } - void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } - const Link& GetScrollHdl() const { return maScrollHdl; } - void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } - const Link& GetEndScrollHdl() const { return maEndScrollHdl; } + void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; } + const Link<>& GetScrollHdl() const { return maScrollHdl; } + void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; } + const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; } virtual Size GetOptimalSize() const SAL_OVERRIDE; }; diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index a2900309abe6..4f3677677e3b 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -50,8 +50,8 @@ private: ScrollType meScrollType; bool mbCalcSize; bool mbFullDrag; - Link maSlideHdl; - Link maEndSlideHdl; + Link<> maSlideHdl; + Link<> maEndSlideHdl; using Control::ImplInitSettings; using Window::ImplInit; @@ -107,10 +107,10 @@ public: Size CalcWindowSizePixel(); - void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; } - const Link& GetSlideHdl() const { return maSlideHdl; } - void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; } - const Link& GetEndSlideHdl() const { return maEndSlideHdl; } + void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; } + const Link<>& GetSlideHdl() const { return maSlideHdl; } + void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl = rLink; } + const Link<>& GetEndSlideHdl() const { return maEndSlideHdl; } }; #endif // INCLUDED_VCL_SLIDER_HXX diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index a78f3b292b1f..1e40c6d6f017 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -43,8 +43,8 @@ private: bool mbInitialDown : 1; bool mbHorz : 1; bool mbUpperIsFocused : 1; - Link maUpHdlLink; - Link maDownHdlLink; + Link<> maUpHdlLink; + Link<> maDownHdlLink; long mnMinRange; long mnMaxRange; long mnValue; @@ -84,10 +84,10 @@ public: long GetValueStep() const { return mnValueStep; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } + void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } + const Link<>& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } + const Link<>& GetDownHdl() const { return maDownHdlLink; } private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 20a3a43f3745..8060271d1777 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -34,10 +34,10 @@ protected: Rectangle maUpperRect; Rectangle maLowerRect; Rectangle maDropDownRect; // noch nicht angebunden... - Link maUpHdlLink; - Link maDownHdlLink; - Link maFirstHdlLink; - Link maLastHdlLink; + Link<> maUpHdlLink; + Link<> maDownHdlLink; + Link<> maFirstHdlLink; + Link<> maLastHdlLink; bool mbRepeat:1, mbSpin:1, mbInitialUp:1, @@ -89,14 +89,14 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } - void SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; } - const Link& GetFirstHdl() const { return maFirstHdlLink; } - void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } - const Link& GetLastHdl() const { return maLastHdlLink; } + void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } + const Link<>& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } + const Link<>& GetDownHdl() const { return maDownHdlLink; } + void SetFirstHdl( const Link<>& rLink ) { maFirstHdlLink = rLink; } + const Link<>& GetFirstHdl() const { return maFirstHdlLink; } + void SetLastHdl( const Link<>& rLink ) { maLastHdlLink = rLink; } + const Link<>& GetLastHdl() const { return maLastHdlLink; } virtual Size CalcMinimumSize() const SAL_OVERRIDE; virtual Size CalcMinimumSizeForText(const OUString &rString) const SAL_OVERRIDE; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 91a1c0df99c5..a9a185bb67eb 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -39,9 +39,9 @@ private: bool mbKbdSplitting; long mbInKeyEvent; long mnKeyboardStepSize; - Link maStartSplitHdl; - Link maSplitHdl; - Link maEndSplitHdl; + Link<> maStartSplitHdl; + Link<> maSplitHdl; + Link<> maEndSplitHdl; SAL_DLLPRIVATE void ImplInitSplitterData(); SAL_DLLPRIVATE void ImplDrawSplitter(); @@ -99,12 +99,12 @@ public: // the default is 10% of the reference window's width/height void SetKeyboardStepSize( long nStepSize ); - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } - const Link& GetStartSplitHdl() const { return maStartSplitHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - void SetEndSplitHdl( const Link& rLink ) { maEndSplitHdl = rLink; } - const Link& GetEndSplitHdl() const { return maEndSplitHdl; } - const Link& GetSplitHdl() const { return maSplitHdl; } + void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; } + const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; } + void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } + void SetEndSplitHdl( const Link<>& rLink ) { maEndSplitHdl = rLink; } + const Link<>& GetEndSplitHdl() const { return maEndSplitHdl; } + const Link<>& GetSplitHdl() const { return maSplitHdl; } }; #endif // INCLUDED_VCL_SPLIT_HXX diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index d0ffa134a10a..08ea8f5c7871 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -78,12 +78,12 @@ private: mbFadeOutPressed:1, mbFadeNoButtonMode:1, mbNoAlign:1; - Link maStartSplitHdl; - Link maSplitHdl; - Link maSplitResizeHdl; - Link maAutoHideHdl; - Link maFadeInHdl; - Link maFadeOutHdl; + Link<> maStartSplitHdl; + Link<> maSplitHdl; + Link<> maSplitResizeHdl; + Link<> maAutoHideHdl; + Link<> maFadeInHdl; + Link<> maFadeOutHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -203,18 +203,18 @@ public: void SetAutoHideState( bool bAutoHide ); bool GetAutoHideState() const { return mbAutoHideIn; } - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } - const Link& GetStartSplitHdl() const { return maStartSplitHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - const Link& GetSplitHdl() const { return maSplitHdl; } - void SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; } - const Link& GetSplitResizeHdl() const { return maSplitResizeHdl; } - void SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; } - const Link& GetAutoHideHdl() const { return maAutoHideHdl; } - void SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; } - const Link& GetFadeInHdl() const { return maFadeInHdl; } - void SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; } - const Link& GetFadeOutHdl() const { return maFadeOutHdl; } + void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; } + const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; } + void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } + const Link<>& GetSplitHdl() const { return maSplitHdl; } + void SetSplitResizeHdl( const Link<>& rLink ) { maSplitResizeHdl = rLink; } + const Link<>& GetSplitResizeHdl() const { return maSplitResizeHdl; } + void SetAutoHideHdl( const Link<>& rLink ) { maAutoHideHdl = rLink; } + const Link<>& GetAutoHideHdl() const { return maAutoHideHdl; } + void SetFadeInHdl( const Link<>& rLink ) { maFadeInHdl = rLink; } + const Link<>& GetFadeInHdl() const { return maFadeInHdl; } + void SetFadeOutHdl( const Link<>& rLink ) { maFadeOutHdl = rLink; } + const Link<>& GetFadeOutHdl() const { return maFadeOutHdl; } }; #endif // INCLUDED_VCL_SPLITWIN_HXX diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 50b52f981a91..f0fdbf653f25 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -93,8 +93,8 @@ private: bool mbProgressMode; bool mbInUserDraw; bool mbAdjustHiDPI; - Link maClickHdl; - Link maDoubleClickHdl; + Link<> maClickHdl; + Link<> maDoubleClickHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); @@ -198,10 +198,10 @@ public: Size CalcWindowSizePixel() const; - 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 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; } using Window::SetAccessibleName; void SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ); diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 720bf7eeeecf..a576a2c479b8 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -42,7 +42,6 @@ #include <o3tl/typed_flags_set.hxx> class BitmapEx; -class Link; class AllSettings; class DataChangedEvent; class Accelerator; @@ -591,7 +590,7 @@ public: GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex, EnableNoYieldMode, DisableNoYieldMode, RemovePostYieldListener */ - static void AddPostYieldListener( const Link& i_rListener ); + static void AddPostYieldListener( const Link<>& i_rListener ); /** Remove listener for yield events @@ -601,7 +600,7 @@ public: GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex, AddPostYieldListener, EnableNoYieldMode, DisableNoYieldMode */ - static void RemovePostYieldListener( const Link& i_rListener ); + static void RemovePostYieldListener( const Link<>& i_rListener ); /** Queries whether the application is in "main", i.e. not yet in @@ -755,7 +754,7 @@ public: @see RemoveEventListener, AddKeyListener, RemoveKeyListener */ - static void AddEventListener( const Link& rEventListener ); + static void AddEventListener( const Link<>& rEventListener ); /** Remove a VCL event listener from the application. @@ -763,7 +762,7 @@ public: @see AddEventListener, AddKeyListener, RemoveKeyListener */ - static void RemoveEventListener( const Link& rEventListener ); + static void RemoveEventListener( const Link<>& rEventListener ); /** Add a keypress listener to the application. If keypress listener exists, then initialize the application's keypress event listener with a new one, then @@ -773,7 +772,7 @@ public: @see AddEventListener, RemoveEventListener, RemoveKeyListener */ - static void AddKeyListener( const Link& rKeyListener ); + static void AddKeyListener( const Link<>& rKeyListener ); /** Remove a keypress listener from the application. @@ -781,7 +780,7 @@ public: @see AddEventListener, RemoveEventListener, AddKeyListener */ - static void RemoveKeyListener( const Link& rKeyListener ); + static void RemoveKeyListener( const Link<>& rKeyListener ); /** Send event to all VCL application event listeners @@ -869,7 +868,7 @@ public: @return the event ID used to post the event. */ - static ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL ); + static ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL ); /** Remove user event based on event ID @@ -887,13 +886,13 @@ public: @return true if the handler was inserted successfully, false if it couldn't be inserted. */ - static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); + static bool InsertIdleHdl( const Link<>& rLink, sal_uInt16 nPriority ); /** Remove an idle handler from the application. @param rLink const reference to the idle handler to remove */ - static void RemoveIdleHdl( const Link& rLink ); + static void RemoveIdleHdl( const Link<>& rLink ); /*** Get the DisplayConnection. @@ -1359,13 +1358,13 @@ public: @see GetFilterHdl */ - static void SetFilterHdl( const Link& rLink ); + static void SetFilterHdl( const Link<>& rLink ); /*** Get a new graphics filter @return Const reference to the Link object (the filter) */ - static const Link& GetFilterHdl(); + static const Link<>& GetFilterHdl(); ///@} @@ -1504,7 +1503,7 @@ public: ///@} // For vclbootstrapprotector: - static void setDeInitHook(Link const & hook); + static void setDeInitHook(Link<> const & hook); private: @@ -1703,7 +1702,7 @@ VCL_DLLPUBLIC void JoinMainLoopThread(); inline void Application::EndYield() { - PostUserEvent( Link() ); + PostUserEvent( Link<>() ); } namespace vcl diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index f90fb16bfeea..29ed4b4225ed 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -267,8 +267,8 @@ public: void SetApplicationID( const OUString &rApplicationID ); - void SetCloseHdl(const Link& rLink); - const Link& GetCloseHdl() const; + void SetCloseHdl(const Link<>& rLink); + const Link<>& GetCloseHdl() const; SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutIdle.IsActive(); } diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 05fd48e9cef7..df8e6ffb6669 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -49,8 +49,8 @@ private: bool mbRestoreUnqId; bool mbSmallInvalidate; bool mbLayoutDirty; - Link maActivateHdl; - Link maDeactivateHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; using Control::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -160,10 +160,10 @@ public: const OString& GetHelpId() const { return Control::GetHelpId(); } - 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; } // returns (control relative) bounding rectangle for the // character at index nIndex relative to the text of page nPageId diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 8ab238a293bd..c1779ce04294 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC Timer : public Scheduler { protected: - Link maTimeoutHdl; // Callback Link + Link<> maTimeoutHdl; // Callback Link sal_uInt64 mnTimeout; bool mbAuto; @@ -43,8 +43,8 @@ public: /// Make it possible to associate a callback with this timer handler /// of course, you can also sub-class and override 'Invoke' - void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } - const Link& GetTimeoutHdl() const { return maTimeoutHdl; } + void SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; } + const Link<>& GetTimeoutHdl() const { return maTimeoutHdl; } void SetTimeout( sal_uInt64 nTimeoutMs ); sal_uInt64 GetTimeout() const { return mnTimeout; } virtual void Invoke() SAL_OVERRIDE; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index b03f05174a01..661ea918a641 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -185,15 +185,15 @@ private: PointerStyle meLastStyle; WinBits mnWinStyle; ToolBoxLayoutMode meLayoutMode; - Link maClickHdl; - Link maDoubleClickHdl; - Link maActivateHdl; - Link maDeactivateHdl; - Link maHighlightHdl; - Link maSelectHdl; - Link maCommandHandler; - Link maStateChangedHandler; - Link maDataChangedHandler; + Link<> maClickHdl; + Link<> maDoubleClickHdl; + Link<> maActivateHdl; + Link<> maDeactivateHdl; + Link<> maHighlightHdl; + Link<> maSelectHdl; + Link<> maCommandHandler; + Link<> maStateChangedHandler; + Link<> maDataChangedHandler; public: using Window::ImplInit; @@ -495,26 +495,26 @@ public: using DockingWindow::SetHelpId; using DockingWindow::GetHelpId; - 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 SetDropdownClickHdl( const Link& rLink ); - const Link& GetDropdownClickHdl() const; - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return maDeactivateHdl; } - 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 SetCommandHdl( const Link& aLink ) { maCommandHandler = aLink; } - const Link& GetCommandHdl() const { return maCommandHandler; } - void SetStateChangedHdl( const Link& aLink ) { maStateChangedHandler = aLink; } - const Link& GetStateChangedHdl() const { return maStateChangedHandler; } - void SetDataChangedHdl( const Link& aLink ) { maDataChangedHandler = aLink; } - const Link& GetDataChangedHdl() { return maDataChangedHandler; } + 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 SetDropdownClickHdl( const Link<>& rLink ); + const Link<>& GetDropdownClickHdl() const; + void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } + const Link<>& GetActivateHdl() const { return maActivateHdl; } + void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } + const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; } + 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 SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; } + const Link<>& GetCommandHdl() const { return maCommandHandler; } + void SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; } + const Link<>& GetStateChangedHdl() const { return maStateChangedHandler; } + void SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; } + const Link<>& GetDataChangedHdl() { return maDataChangedHandler; } // support for custom menu (eg for configuration) // note: this menu will also be used to display currently @@ -528,7 +528,7 @@ public: bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void UpdateCustomMenu(); - void SetMenuButtonHdl( const Link& rLink ); + void SetMenuButtonHdl( const Link<>& rLink ); // open custommenu void ExecuteCustomMenu(); diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 99f329e8da65..5729e1d4fcd5 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -261,22 +261,22 @@ public: // and returns true in that case // a handler must return true to signal that it has processed the event bool Process( VclSimpleEvent* pEvent ) const; - void addListener( const Link& rListener ); - void removeListener( const Link& rListener ); + void addListener( const Link<>& rListener ); + void removeListener( const Link<>& rListener ); private: - std::list<Link> m_aListeners; + std::list<Link<>> m_aListeners; }; class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier { - std::list< Link > m_aListeners; + std::list< Link<> > m_aListeners; struct ListenerIt { - std::list< Link >::iterator m_aIt; + std::list< Link<> >::iterator m_aIt; bool m_bWasInvalidated; - ListenerIt(const std::list<Link>::iterator& rIt) + ListenerIt(const std::list<Link<>>::iterator& rIt) : m_aIt(rIt) , m_bWasInvalidated( false ) {} @@ -289,8 +289,8 @@ public: VclEventListeners2(); ~VclEventListeners2(); - void addListener( const Link& ); - void removeListener( const Link& ); + void addListener( const Link<>& ); + void removeListener( const Link<>& ); void callListeners( VclSimpleEvent* ); }; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 034c25412969..441edcd45bf4 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -36,10 +36,10 @@ private: ImpVclMEdit* pImpVclMEdit; OUString aSaveValue; - Link aModifyHdlLink; + Link<> aModifyHdlLink; Timer* pUpdateDataTimer; - Link aUpdateDataHdlLink; + Link<> aUpdateDataHdlLink; protected: @@ -109,10 +109,10 @@ public: const OUString& GetSavedValue() const { return aSaveValue; } bool IsValueChangedFromSaved() const { return aSaveValue != GetText(); } - void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } - const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } + void SetModifyHdl( const Link<>& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } + const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link<>& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index cde2c864f248..ccee88b2c20d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -722,12 +722,12 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); virtual vcl::Window* GetPreferredKeyInputWindow(); - void AddEventListener( const Link& rEventListener ); - void RemoveEventListener( const Link& rEventListener ); - void AddChildEventListener( const Link& rEventListener ); - void RemoveChildEventListener( const Link& rEventListener ); + void AddEventListener( const Link<>& rEventListener ); + void RemoveEventListener( const Link<>& rEventListener ); + void AddChildEventListener( const Link<>& rEventListener ); + void RemoveChildEventListener( const Link<>& rEventListener ); - ImplSVEvent * PostUserEvent( const Link& rLink, void* pCaller = NULL ); + ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL ); void RemoveUserEvent( ImplSVEvent * nUserEvent ); void IncrementLockCount(); |