sw/source/core/inc/tabfrm.hxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 7a9453a09ac1dc2af3192c9eda7980b425fc966a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Aug 13 11:24:14 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 14 11:13:41 2018 +0200
loplugin:returnconstant in SwTabFrame
Change-Id: I9a8ecd32516315df25e7bd3c9c6672743c567035
Reviewed-on: https://gerrit.libreoffice.org/58960
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 288055e9e30a..8e6f20115919 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -91,7 +91,7 @@ class SwTabFrame: public SwLayoutFrame, public SwFlowFrame
* Join() gets the Follow's content and destroys it.
*/
bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep );
- bool Join();
+ void Join();
void UpdateAttr_(
const SfxPoolItem*,
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 5a181405411d..5513c8ec1a79 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1301,7 +1301,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool
bTryToSplit, bool bTableRowK
return bRet;
}
-bool SwTabFrame::Join()
+void SwTabFrame::Join()
{
OSL_ENSURE( !HasFollowFlowLine(), "Joining follow flow line" );
@@ -1337,8 +1337,6 @@ bool SwTabFrame::Join()
Grow( nHeight );
}
-
- return true;
}
void SwInvalidatePositions( SwFrame *pFrame, long nBottom )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
