summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/dinfdlg.hxx4
-rw-r--r--include/sfx2/sidebar/Deck.hxx2
-rw-r--r--include/sfx2/thumbnailview.hxx2
-rw-r--r--include/svtools/addresstemplate.hxx2
-rw-r--r--include/svtools/brwbox.hxx8
-rw-r--r--include/svtools/scrwin.hxx4
-rw-r--r--include/svtools/valueset.hxx2
-rw-r--r--include/svx/charmap.hxx2
-rw-r--r--include/svx/dlgctl3d.hxx2
-rw-r--r--include/svx/rubydialog.hxx2
-rw-r--r--include/toolkit/awt/scrollabledialog.hxx2
-rw-r--r--include/vcl/layout.hxx2
-rw-r--r--include/vcl/scrbar.hxx14
13 files changed, 24 insertions, 24 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 2d8ba49c809c..5629902b60cb 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -474,7 +474,7 @@ private:
sal_Int32 m_nThumbPos;
- DECL_LINK( ScrollHdl, ScrollBar* );
+ DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_LINK_TYPED( RemovedHdl, void*, void );
public:
@@ -598,7 +598,7 @@ private:
CmisPropertiesWindow m_pPropertiesWin;
VclScrolledWindow& m_rScrolledWindow;
ScrollBar& m_rVertScroll;
- DECL_LINK( ScrollHdl, ScrollBar* );
+ DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
void checkAutoVScroll();
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 43fddcc096b7..1d799ce73111 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -92,7 +92,7 @@ private:
VclPtr<vcl::Window> mpFiller;
VclPtr<ScrollBar> mpVerticalScrollBar;
- DECL_LINK(HandleVerticalScrollBarChange,void*);
+ DECL_LINK_TYPED(HandleVerticalScrollBarChange, ScrollBar*, void);
bool ProcessWheelEvent(CommandEvent* pCommandEvent);
};
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index fa4563d3c732..5c5efee18e8d 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -290,7 +290,7 @@ protected:
SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos );
SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
SFX2_DLLPRIVATE bool ImplHasAccessibleListeners();
- DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
DECL_LINK(OnItemSelected, ThumbnailViewItem*);
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 0607377e9b3d..be355f34ec6a 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -125,7 +125,7 @@ namespace svt
// initialize the dialog from the configuration data
void loadConfiguration();
- DECL_LINK(OnFieldScroll, ScrollBar*);
+ DECL_LINK_TYPED(OnFieldScroll, ScrollBar*, void);
DECL_LINK(OnFieldSelect, ListBox*);
DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void);
DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*);
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index bd54832488a7..6a48b5bf9119 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -311,13 +311,13 @@ private:
SVT_DLLPRIVATE long ImpGetDataRowHeight() const;
SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, sal_uInt16 nColId ) const;
- SVT_DLLPRIVATE sal_uInt16 FrozenColCount() const;
+ SVT_DLLPRIVATE sal_uInt16 FrozenColCount() const;
SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos );
- DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
- DECL_DLLPRIVATE_LINK( EndScrollHdl, void * );
- DECL_DLLPRIVATE_LINK_TYPED( StartDragHdl, HeaderBar *, void );
+ DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+ DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar*, void );
+ DECL_DLLPRIVATE_LINK_TYPED( StartDragHdl, HeaderBar*, void );
SVT_DLLPRIVATE long GetFrozenWidth() const;
diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx
index 6f29fa04f168..a96b62c032a4 100644
--- a/include/svtools/scrwin.hxx
+++ b/include/svtools/scrwin.hxx
@@ -64,8 +64,8 @@ private:
bVCenter:1;
SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags );
- DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
- DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * );
+ DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar *, void );
+ DECL_DLLPRIVATE_LINK_TYPED( EndScrollHdl, ScrollBar *, void );
public:
ScrollableWindow( vcl::Window* pParent, WinBits nBits = 0,
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7b4684c06e6e..3ad941c28bb2 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -271,7 +271,7 @@ private:
SVT_DLLPRIVATE bool ImplHasAccessibleListeners();
SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat );
SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel );
- DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
ValueSet (const ValueSet &) SAL_DELETED_FUNCTION;
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 636f9c256532..e23f941bffe7 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -120,7 +120,7 @@ private:
void InitSettings(vcl::RenderContext& rRenderContext);
// abstraction layers are: Unicode<->MapIndex<->Pixel
Point MapIndexToPixel( int) const;
- DECL_LINK(VscrollHdl, void *);
+ DECL_LINK_TYPED(VscrollHdl, ScrollBar*, void);
void init();
Rectangle getGridRectangle(const Point &rPointUL, const Size &rOutputSize);
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 80e442ea62de..65fc6f479dd2 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -177,7 +177,7 @@ protected:
DECL_LINK( InternalInteractiveChange, void*);
DECL_LINK( InternalSelectionChange, void*);
- DECL_LINK( ScrollBarMove, void*);
+ DECL_LINK_TYPED( ScrollBarMove, ScrollBar*, void);
DECL_LINK_TYPED( ButtonPress, Button*, void);
// initialize local parameters
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index 3a7cbdbbfbab..b7108e2e7aed 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -131,7 +131,7 @@ class SvxRubyDialog : public SfxModelessDialog
DECL_LINK_TYPED(ApplyHdl_Impl, Button*, void);
DECL_LINK_TYPED(CloseHdl_Impl, Button*, void);
DECL_LINK_TYPED(StylistHdl_Impl, Button*, void);
- DECL_LINK(ScrollHdl_Impl, ScrollBar*);
+ DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void);
DECL_LINK(PositionHdl_Impl, ListBox*);
DECL_LINK(AdjustHdl_Impl, ListBox*);
DECL_LINK(CharStyleHdl_Impl, void *);
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 42b70fe9b20c..87738f9dc38b 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -62,7 +62,7 @@ namespace toolkit
virtual void SetScrollTop( long Top ) SAL_OVERRIDE;
void setScrollVisibility( ScrollBarVisibility rState );
- DECL_LINK( ScrollBarHdl, ScrollBar* );
+ DECL_LINK_TYPED( ScrollBarHdl, ScrollBar*, void );
virtual void ResetScrollBars();
// Window
virtual void Resize() SAL_OVERRIDE;
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index d9a643f8f5cd..e0a72bc9c2cb 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -527,7 +527,7 @@ public:
protected:
virtual Size calculateRequisition() const SAL_OVERRIDE;
virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
- DECL_LINK(ScrollBarHdl, void *);
+ DECL_LINK_TYPED(ScrollBarHdl, ScrollBar*, void);
void InitScrollBars(const Size &rRequest);
virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE;
private:
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index b83bfbb585ca..f125740521bb 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -59,14 +59,14 @@ private:
long mnLineSize;
long mnPageSize;
long mnDelta;
- sal_uInt16 mnDragDraw;
- sal_uInt16 mnStateFlags;
+ sal_uInt16 mnDragDraw;
+ sal_uInt16 mnStateFlags;
ScrollType meScrollType;
ScrollType meDDScrollType;
bool mbCalcSize;
bool mbFullDrag;
- Link<> maScrollHdl;
- Link<> maEndScrollHdl;
+ Link<ScrollBar*,void> maScrollHdl;
+ Link<ScrollBar*,void> maEndScrollHdl;
SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt );
using Window::ImplInit;
@@ -133,9 +133,9 @@ public:
long GetDelta() const { return mnDelta; }
ScrollType GetType() const { return meScrollType; }
- void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; }
- void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; }
- const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; }
+ void SetScrollHdl( const Link<ScrollBar*,void>& rLink ) { maScrollHdl = rLink; }
+ void SetEndScrollHdl( const Link<ScrollBar*,void>& rLink ) { maEndScrollHdl = rLink; }
+ const Link<ScrollBar*,void>& GetEndScrollHdl() const { return maEndScrollHdl; }
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
generated by cgit (git 2.34.1) at 2025-04-28 17:27:59 +0000