diff options
| -rw-r--r-- | cui/source/inc/border.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/border.cxx | 3 | ||||
| -rw-r--r-- | include/svx/frmsel.hxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/frmsel.cxx | 6 | ||||
| -rw-r--r-- | svx/source/inc/frmselimpl.hxx | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index f6d8abe305a8..3192d51df651 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -121,7 +121,7 @@ private: DECL_LINK( SelColHdl_Impl, ListBox* ); DECL_LINK_TYPED( SelPreHdl_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( ModifyWidthHdl_Impl, void*); DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index b79bdacf0599..fb22d0ade3cd 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -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()) { @@ -1179,7 +1179,6 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl) m_pSynchronizeCB->Enable( m_pRightMF->IsEnabled() || m_pTopMF->IsEnabled() || m_pBottomMF->IsEnabled() || m_pLeftMF->IsEnabled() ); } - return 0; } diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index a73609caca6c..924495b4e8bc 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<LinkParamNone*,void>& 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<LinkParamNone*,void>& rHdl ); /** Returns true, if the specified frame border is selected. */ bool IsBorderSelected( FrameBorderType eBorder ) const; diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 1aec0e688c91..72c8c20b655e 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -921,12 +921,12 @@ bool FrameSelector::GetVisibleColor( Color& rColor ) const } // frame border selection -const Link<>& FrameSelector::GetSelectHdl() const +const Link<LinkParamNone*,void>& FrameSelector::GetSelectHdl() const { return mxImpl->maSelectHdl; } -void FrameSelector::SetSelectHdl( const Link<>& rHdl ) +void FrameSelector::SetSelectHdl( const Link<LinkParamNone*,void>& rHdl ) { mxImpl->maSelectHdl = rHdl; } @@ -1130,7 +1130,7 @@ void FrameSelector::MouseButtonDown( const MouseEvent& rMEvt ) mxImpl->ToggleBorderState( **aIt ); } - GetSelectHdl().Call( this ); + GetSelectHdl().Call( nullptr ); } } } diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 34f77ba36e1c..073b9100701a 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -122,7 +122,7 @@ struct FrameSelectorImpl : public Resource FrameSelFlags mnFlags; /// Flags for enabled frame borders. FrameBorderPtrVec maAllBorders; /// Pointers to all 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 mnArrowSize; /// Size of an arrow image. |