Kaydet (Commit) 4cb59a86 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix IndentingPagesHdl type (and GetIndentingPagesHdl is unused)

Change-Id: Ide5398040678a81e032e91e582b39d516e8c08a8
üst 51e84809
...@@ -1251,10 +1251,10 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ) ...@@ -1251,10 +1251,10 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount )
DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"ImpTextPasted failed"); DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"ImpTextPasted failed");
} }
long Outliner::IndentingPagesHdl( OutlinerView* pView ) bool Outliner::IndentingPagesHdl( OutlinerView* pView )
{ {
if( !aIndentingPagesHdl.IsSet() ) if( !aIndentingPagesHdl.IsSet() )
return 1; return true;
return aIndentingPagesHdl.Call( pView ); return aIndentingPagesHdl.Call( pView );
} }
......
...@@ -596,7 +596,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster ...@@ -596,7 +596,7 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
Link<Outliner*,void> aDepthChangedHdl; Link<Outliner*,void> aDepthChangedHdl;
Link<Outliner*,void> aBeginMovingHdl; Link<Outliner*,void> aBeginMovingHdl;
Link<Outliner*,void> aEndMovingHdl; Link<Outliner*,void> aEndMovingHdl;
Link<OutlinerView*,long> aIndentingPagesHdl; Link<OutlinerView*,bool> aIndentingPagesHdl;
Link<OutlinerView*,bool> aRemovingPagesHdl; Link<OutlinerView*,bool> aRemovingPagesHdl;
Link<EditFieldInfo*,void> aFieldClickedHdl; Link<EditFieldInfo*,void> aFieldClickedHdl;
Link<EditFieldInfo*,void> aCalcFieldValueHdl; Link<EditFieldInfo*,void> aCalcFieldValueHdl;
...@@ -775,9 +775,8 @@ public: ...@@ -775,9 +775,8 @@ public:
bool RemovingPagesHdl( OutlinerView* ); bool RemovingPagesHdl( OutlinerView* );
void SetRemovingPagesHdl(const Link<OutlinerView*,bool>& rLink){aRemovingPagesHdl=rLink;} void SetRemovingPagesHdl(const Link<OutlinerView*,bool>& rLink){aRemovingPagesHdl=rLink;}
Link<OutlinerView*,bool> GetRemovingPagesHdl() const { return aRemovingPagesHdl; } Link<OutlinerView*,bool> GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
long IndentingPagesHdl( OutlinerView* ); bool IndentingPagesHdl( OutlinerView* );
void SetIndentingPagesHdl(const Link<OutlinerView*,long>& rLink){aIndentingPagesHdl=rLink;} void SetIndentingPagesHdl(const Link<OutlinerView*,bool>& rLink){aIndentingPagesHdl=rLink;}
Link<OutlinerView*,long> GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
// valid only in the two upper handlers // valid only in the two upper handlers
sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; } sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
......
...@@ -102,7 +102,7 @@ public: ...@@ -102,7 +102,7 @@ public:
DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void ); DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void );
DECL_LINK_TYPED( EndMovingHdl, Outliner *, void ); DECL_LINK_TYPED( EndMovingHdl, Outliner *, void );
DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool ); DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, long ); DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool );
DECL_LINK( BeginDropHdl, void * ); DECL_LINK( BeginDropHdl, void * );
DECL_LINK( EndDropHdl, void * ); DECL_LINK( EndDropHdl, void * );
DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void ); DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
......
...@@ -1194,9 +1194,9 @@ IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool) ...@@ -1194,9 +1194,9 @@ IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool)
/** /**
* Handler for indenting level 0 paragraphs (pages): Warning * 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 /** returns the first slide that is selected in the outliner or where
...@@ -1371,7 +1371,7 @@ void OutlineView::ResetLinks() const ...@@ -1371,7 +1371,7 @@ void OutlineView::ResetLinks() const
mrOutliner.SetEndMovingHdl(Link<::Outliner*,void>()); mrOutliner.SetEndMovingHdl(Link<::Outliner*,void>());
mrOutliner.SetStatusEventHdl(aEmptyLink); mrOutliner.SetStatusEventHdl(aEmptyLink);
mrOutliner.SetRemovingPagesHdl(Link<OutlinerView*,bool>()); mrOutliner.SetRemovingPagesHdl(Link<OutlinerView*,bool>());
mrOutliner.SetIndentingPagesHdl(Link<OutlinerView*,long>()); mrOutliner.SetIndentingPagesHdl(Link<OutlinerView*,bool>());
mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>()); mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>()); mrOutliner.SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
mrOutliner.SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>()); mrOutliner.SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
......
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