sw/source/core/inc/txtfrm.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 82ab8e2a1df9436c266a1eb9419840dc2943b2bf
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Dec 22 11:10:24 2014 +0100
-Werror,-Winfinite-recursion
(cherry picked from commit 7b58b777bd15d5f34375e0325e4838e07f22dedc)
Conflicts:
sw/source/core/inc/frame.hxx
Change-Id: I445302a2f51bbd244fcf7dbf2058efc30ac0b886
Reviewed-on: https://gerrit.libreoffice.org/16423
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 5d82883..354dd37 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -427,7 +427,7 @@ public:
inline SwTwips GetFtnFrmHeight() const;
SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn );
inline const SwTxtFrm *FindFtnRef( const SwTxtFtn *pFtn ) const
- { return FindFtnRef( pFtn ); }
+ { return const_cast<SwTxtFrm *>(this)->FindFtnRef( pFtn ); }
void ConnectFtn( SwTxtFtn *pFtn, const SwTwips nDeadLine );
/**
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
