Kaydet (Commit) 37603521 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I8bea5ac685b0076649412bd95501461242797d77
Reviewed-on: https://gerrit.libreoffice.org/18266Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 5beffcf3
...@@ -85,12 +85,7 @@ private: ...@@ -85,12 +85,7 @@ private:
mbFadeOutPressed:1, mbFadeOutPressed:1,
mbFadeNoButtonMode:1, mbFadeNoButtonMode:1,
mbNoAlign:1; mbNoAlign:1;
Link<> maStartSplitHdl; Link<SplitWindow*,void> maSplitHdl;
Link<> maSplitHdl;
Link<> maSplitResizeHdl;
Link<> maAutoHideHdl;
Link<> maFadeInHdl;
Link<> maFadeOutHdl;
using Window::ImplInit; using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
...@@ -200,7 +195,7 @@ public: ...@@ -200,7 +195,7 @@ public:
bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; }
void SetAutoHideState( bool bAutoHide ); void SetAutoHideState( bool bAutoHide );
void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; } void SetSplitHdl( const Link<SplitWindow*,void>& rLink ) { maSplitHdl = rLink; }
}; };
#endif // INCLUDED_VCL_SPLITWIN_HXX #endif // INCLUDED_VCL_SPLITWIN_HXX
......
...@@ -79,7 +79,7 @@ namespace rptui ...@@ -79,7 +79,7 @@ namespace rptui
DECL_LINK_TYPED(MarkTimeout, Idle *, void); DECL_LINK_TYPED(MarkTimeout, Idle *, void);
DECL_LINK( SplitHdl, void* ); DECL_LINK_TYPED( SplitHdl, SplitWindow*, void );
void ImplInitSettings(); void ImplInitSettings();
......
...@@ -403,7 +403,7 @@ void ODesignView::ImplInitSettings() ...@@ -403,7 +403,7 @@ void ODesignView::ImplInitSettings()
SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
} }
IMPL_LINK_NOARG( ODesignView, SplitHdl ) IMPL_LINK_NOARG_TYPED( ODesignView, SplitHdl, SplitWindow*, void )
{ {
const Size aOutputSize = GetOutputSizePixel(); const Size aOutputSize = GetOutputSizePixel();
const long nTest = aOutputSize.Width() * m_aSplitWin->GetItemSize(TASKPANE_ID) / 100; const long nTest = aOutputSize.Width() * m_aSplitWin->GetItemSize(TASKPANE_ID) / 100;
...@@ -417,8 +417,6 @@ IMPL_LINK_NOARG( ODesignView, SplitHdl ) ...@@ -417,8 +417,6 @@ IMPL_LINK_NOARG( ODesignView, SplitHdl )
(void)nOldSplitPos; (void)nOldSplitPos;
getController().setSplitPos(nTest); getController().setSplitPos(nTest);
} }
return 0L;
} }
void ODesignView::SelectAll(const sal_uInt16 _nObjectType) void ODesignView::SelectAll(const sal_uInt16 _nObjectType)
......
...@@ -2215,7 +2215,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) ...@@ -2215,7 +2215,6 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
void SplitWindow::StartSplit() void SplitWindow::StartSplit()
{ {
maStartSplitHdl.Call( this );
} }
void SplitWindow::Split() void SplitWindow::Split()
...@@ -2225,22 +2224,18 @@ void SplitWindow::Split() ...@@ -2225,22 +2224,18 @@ void SplitWindow::Split()
void SplitWindow::SplitResize() void SplitWindow::SplitResize()
{ {
maSplitResizeHdl.Call( this );
} }
void SplitWindow::AutoHide() void SplitWindow::AutoHide()
{ {
maAutoHideHdl.Call( this );
} }
void SplitWindow::FadeIn() void SplitWindow::FadeIn()
{ {
maFadeInHdl.Call( this );
} }
void SplitWindow::FadeOut() void SplitWindow::FadeOut()
{ {
maFadeOutHdl.Call( this );
} }
void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment