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

convert Link<> to typed

Change-Id: I8ffca89e5b1b495452efebf8f57d04ada1bfdf1c
üst 036ee345
...@@ -121,7 +121,7 @@ private: ...@@ -121,7 +121,7 @@ private:
DECL_LINK( SelColHdl_Impl, ListBox* ); DECL_LINK( SelColHdl_Impl, ListBox* );
DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void );
DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void );
DECL_LINK( LinesChanged_Impl, void* ); DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void );
DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
DECL_LINK( ModifyWidthHdl_Impl, void*); DECL_LINK( ModifyWidthHdl_Impl, void*);
DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); DECL_LINK_TYPED( SyncHdl_Impl, Button*, void);
......
...@@ -1106,7 +1106,7 @@ void SvxBorderTabPage::FillLineListBox_Impl() ...@@ -1106,7 +1106,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
} }
IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void)
{ {
if(!mbUseMarginItem && m_pLeftMF->IsVisible()) if(!mbUseMarginItem && m_pLeftMF->IsVisible())
{ {
...@@ -1179,7 +1179,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) ...@@ -1179,7 +1179,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
m_pSynchronizeCB->Enable( m_pRightMF->IsEnabled() || m_pTopMF->IsEnabled() || m_pSynchronizeCB->Enable( m_pRightMF->IsEnabled() || m_pTopMF->IsEnabled() ||
m_pBottomMF->IsEnabled() || m_pLeftMF->IsEnabled() ); m_pBottomMF->IsEnabled() || m_pLeftMF->IsEnabled() );
} }
return 0;
} }
......
...@@ -132,9 +132,9 @@ public: ...@@ -132,9 +132,9 @@ public:
// frame border selection ------------------------------------------------- // frame border selection -------------------------------------------------
/** Returns the current selection handler. */ /** Returns the current selection handler. */
const Link<>& GetSelectHdl() const; const Link<LinkParamNone*,void>& GetSelectHdl() const;
/** Sets the passed handler that is called if the selection of the control changes. */ /** Sets the passed handler that is called if the selection of the control changes. */
void SetSelectHdl( const Link<>& rHdl ); void SetSelectHdl( const Link<LinkParamNone*,void>& rHdl );
/** Returns true, if the specified frame border is selected. */ /** Returns true, if the specified frame border is selected. */
bool IsBorderSelected( FrameBorderType eBorder ) const; bool IsBorderSelected( FrameBorderType eBorder ) const;
......
...@@ -921,12 +921,12 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const ...@@ -921,12 +921,12 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const
} }
// frame border selection // frame border selection
const Link<>& FrameSelector::GetSelectHdl() const const Link<LinkParamNone*,void>& FrameSelector::GetSelectHdl() const
{ {
return mxImpl->maSelectHdl; return mxImpl->maSelectHdl;
} }
void FrameSelector::SetSelectHdl( const Link<>& rHdl ) void FrameSelector::SetSelectHdl( const Link<LinkParamNone*,void>& rHdl )
{ {
mxImpl->maSelectHdl = rHdl; mxImpl->maSelectHdl = rHdl;
} }
...@@ -1130,7 +1130,7 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt ) ...@@ -1130,7 +1130,7 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt )
mxImpl->ToggleBorderState( **aIt ); mxImpl->ToggleBorderState( **aIt );
} }
GetSelectHdl().Call( this ); GetSelectHdl().Call( nullptr );
} }
} }
} }
......
...@@ -122,7 +122,7 @@ struct FrameSelectorImpl : public Resource ...@@ -122,7 +122,7 @@ struct FrameSelectorImpl : public Resource
FrameSelFlags mnFlags; /// Flags for enabled frame borders. FrameSelFlags mnFlags; /// Flags for enabled frame borders.
FrameBorderPtrVec maAllBorders; /// Pointers to all frame borders. FrameBorderPtrVec maAllBorders; /// Pointers to all frame borders.
FrameBorderPtrVec maEnabBorders; /// Pointers to enables frame borders. FrameBorderPtrVec maEnabBorders; /// Pointers to enables frame borders.
Link<> maSelectHdl; /// Selection handler. Link<LinkParamNone*,void> maSelectHdl; /// Selection handler.
long mnCtrlSize; /// Size of the control (always square). long mnCtrlSize; /// Size of the control (always square).
long mnArrowSize; /// Size of an arrow image. long mnArrowSize; /// Size of an arrow image.
......
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