diff options
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 4 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/inc/OutlineView.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 86725f0bc110..4493f0a01720 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1251,10 +1251,10 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ) DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"ImpTextPasted failed"); } -long Outliner::IndentingPagesHdl( OutlinerView* pView ) +bool Outliner::IndentingPagesHdl( OutlinerView* pView ) { if( !aIndentingPagesHdl.IsSet() ) - return 1; + return true; return aIndentingPagesHdl.Call( pView ); } diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index d1b05adf6138..d121f0110160 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -596,7 +596,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster Link<Outliner*,void> aDepthChangedHdl; Link<Outliner*,void> aBeginMovingHdl; Link<Outliner*,void> aEndMovingHdl; - Link<OutlinerView*,long> aIndentingPagesHdl; + Link<OutlinerView*,bool> aIndentingPagesHdl; Link<OutlinerView*,bool> aRemovingPagesHdl; Link<EditFieldInfo*,void> aFieldClickedHdl; Link<EditFieldInfo*,void> aCalcFieldValueHdl; @@ -775,9 +775,8 @@ public: bool RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link<OutlinerView*,bool>& rLink){aRemovingPagesHdl=rLink;} Link<OutlinerView*,bool> GetRemovingPagesHdl() const { return aRemovingPagesHdl; } - long IndentingPagesHdl( OutlinerView* ); - void SetIndentingPagesHdl(const Link<OutlinerView*,long>& rLink){aIndentingPagesHdl=rLink;} - Link<OutlinerView*,long> GetIndentingPagesHdl() const { return aIndentingPagesHdl; } + bool IndentingPagesHdl( OutlinerView* ); + void SetIndentingPagesHdl(const Link<OutlinerView*,bool>& rLink){aIndentingPagesHdl=rLink;} // valid only in the two upper handlers sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; } diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 495a4d7b4fc6..0daad3da8f18 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -102,7 +102,7 @@ public: DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void ); DECL_LINK_TYPED( EndMovingHdl, Outliner *, void ); DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool ); - DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, long ); + DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool ); DECL_LINK( BeginDropHdl, void * ); DECL_LINK( EndDropHdl, void * ); DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void ); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 076ee48d6b23..768571807d3f 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1194,9 +1194,9 @@ IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool) /** * Handler for indenting level 0 paragraphs (pages): Warning */ -IMPL_LINK_TYPED( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, long ) +IMPL_LINK_TYPED( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, bool ) { - return RemovingPagesHdl(pOutlinerView) ? 1 : 0; + return RemovingPagesHdl(pOutlinerView); } /** returns the first slide that is selected in the outliner or where @@ -1371,7 +1371,7 @@ void OutlineView::ResetLinks() const mrOutliner.SetEndMovingHdl(Link<::Outliner*,void>()); mrOutliner.SetStatusEventHdl(aEmptyLink); mrOutliner.SetRemovingPagesHdl(Link<OutlinerView*,bool>()); - mrOutliner.SetIndentingPagesHdl(Link<OutlinerView*,long>()); + mrOutliner.SetIndentingPagesHdl(Link<OutlinerView*,bool>()); mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>()); mrOutliner.SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>()); mrOutliner.SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>()); |