sw/source/core/text/txtftn.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit ce1365ec147a33a07df5bdc53796180d84b9d9e5
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Apr 4 12:00:02 2015 +0200
cppcheck: Identical code for different branches
Using a similar fix as Caolan's one:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8f9bc93ba3299efbd8ad181481e6e2e87df7c066
Change-Id: Ib33f9585bf1e1c2cf6dd367bfe4eb0604794decc
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 88ad8aa..8e7c23c 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -527,8 +527,7 @@ void SwTxtFrm::RemoveFtn( const sal_Int32 nStart, const
sal_Int32 nLen )
else
pFtnBoss->RemoveFtn( this, pFtn );
bRemove = bRemove || !bEndDoc;
- OSL_ENSURE( bEndn ? !SwFtnBossFrm::FindFtn( this,
pFtn ) :
- !SwFtnBossFrm::FindFtn( this, pFtn ),
+ OSL_ENSURE( !SwFtnBossFrm::FindFtn( this, pFtn ),
"SwTxtFrm::RemoveFtn: can't get off that footnote"
);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
