diff options
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 9 | ||||
-rw-r--r-- | editeng/source/outliner/paralist.cxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/paralist.hxx | 4 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index c3c86b83c534..912fa49b413f 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1772,13 +1772,10 @@ SfxItemSet Outliner::GetParaAttribs( sal_Int32 nPara ) return pEditEngine->GetParaAttribs( nPara ); } -IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara ) +IMPL_LINK_TYPED( Outliner, ParaVisibleStateChangedHdl, Paragraph&, rPara, void ) { - - sal_Int32 nPara = pParaList->GetAbsPos( pPara ); - pEditEngine->ShowParagraph( nPara, pPara->IsVisible() ); - - return 0; + sal_Int32 nPara = pParaList->GetAbsPos( &rPara ); + pEditEngine->ShowParagraph( nPara, rPara.IsVisible() ); } IMPL_LINK_NOARG_TYPED(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index de8ded1da0cf..5c0a2c22e5be 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -222,7 +222,7 @@ void ParagraphList::Expand( Paragraph* pParent ) if ( !( pPara->IsVisible() ) ) { pPara->bVisible = true; - aVisibleStateChangedHdl.Call( pPara ); + aVisibleStateChangedHdl.Call( *pPara ); } } } @@ -238,7 +238,7 @@ void ParagraphList::Collapse( Paragraph* pParent ) if ( pPara->IsVisible() ) { pPara->bVisible = false; - aVisibleStateChangedHdl.Call( pPara ); + aVisibleStateChangedHdl.Call( *pPara ); } } } diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx index 8bf2d9adf179..04f9cc4babbc 100644 --- a/editeng/source/outliner/paralist.hxx +++ b/editeng/source/outliner/paralist.hxx @@ -66,11 +66,11 @@ public: void Expand( Paragraph* pParent ); void Collapse( Paragraph* pParent ); - void SetVisibleStateChangedHdl( const Link<>& rLink ) { aVisibleStateChangedHdl = rLink; } + void SetVisibleStateChangedHdl( const Link<Paragraph&,void>& rLink ) { aVisibleStateChangedHdl = rLink; } private: - Link<> aVisibleStateChangedHdl; + Link<Paragraph&,void> aVisibleStateChangedHdl; std::vector<Paragraph*> maEntries; }; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 863d9ec41bf1..479d6eb21ce7 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -617,7 +617,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster sal_uLong nDummy; - DECL_LINK( ParaVisibleStateChangedHdl, Paragraph* ); + DECL_LINK_TYPED( ParaVisibleStateChangedHdl, Paragraph&, void ); DECL_LINK_TYPED( BeginMovingParagraphsHdl, MoveParagraphsInfo&, void ); DECL_LINK_TYPED( EndMovingParagraphsHdl, MoveParagraphsInfo&, void ); DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos&, void ); |