diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 17:56:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:09 +0200 |
| commit | 930b60d9a16e2111d3c35371241a753193168936 (patch) | |
| tree | d8a3ec946ad2cee83efae1e7997e2750af81273d | |
| parent | a602a1ce43ea5debf6693d83dd5b164942574969 (diff) | |
Outliner::RemovingPagesHdl return type wants to be bool
Change-Id: I7d57d560f28683a840022cf766ef22cc50683349
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 4 | ||||
| -rw-r--r-- | include/editeng/outliner.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 50c88f0d9376..cecf2b2f3f0d 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1771,9 +1771,9 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString& } } -long Outliner::RemovingPagesHdl( OutlinerView* pView ) +bool Outliner::RemovingPagesHdl( OutlinerView* pView ) { - return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True; + return !aRemovingPagesHdl.IsSet() || aRemovingPagesHdl.Call( pView ); } bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFirstPage, sal_Int32 nPages ) diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 960caa8752df..12bb7792fe13 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -777,7 +777,7 @@ public: sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); } ParaFlag GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; } - long RemovingPagesHdl( OutlinerView* ); + bool RemovingPagesHdl( OutlinerView* ); void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;} Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; } long IndentingPagesHdl( OutlinerView* ); |