[Libreoffice-commits] core.git: sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Jan 15 02:36:13 PST 2014
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 849c3d59f9838516b5e0d56a2630928629384ad3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 15 11:34:19 2014 +0100
Looks like a leftover "> 0"
...when acc295bcee9f7df0f9a36a3ac81b441ece7cc9c9 "INTEGRATION: CWS
swqbf34: #i45085# <lcl_DoesVertPosFits(..)> - correct check for test grow"
changed the computation of bVertPosFits and introduced intermediate nTwipsGrown.
Change-Id: I7ef95bfd0fea80bef12c014b4bef9dc67ecb2000
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index e3296e3..5293cea 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -127,7 +127,7 @@ static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY,
// #i45085# - check, if upper frame would grow the
// excepted amount of twips.
const SwTwips nTwipsGrown = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm)->
- Grow( _nRelPosY - _nAvail, sal_True ) > 0;
+ Grow( _nRelPosY - _nAvail, sal_True );
bVertPosFits = ( nTwipsGrown == ( _nRelPosY - _nAvail ) );
if ( bVertPosFits )
_orpLayoutFrmToGrow = const_cast<SwLayoutFrm*>(_pUpperOfOrientFrm);
More information about the Libreoffice-commits
mailing list