summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <od@openoffice.org>2011-03-11 14:44:06 +0100
committerOliver-Rainer Wittmann <od@openoffice.org>2011-03-11 14:44:06 +0100
commita8664689ece5a4329c9786f1b666e3ab701d908b (patch)
treebbf8c6a305ab74aa1c626852fcf9f0c25257c200 /sw
parentc5a8a2c3cbcee0175127a0662e3d820ea4deea22 (diff)
sw34bf05: #i103292# - method <SwTxtFrmBreak::IsInside(..)> consider space taken as lower space as the last content of a table cell
Diffstat (limited to 'sw')
-rwxr-xr-x[-rw-r--r--]sw/source/core/text/widorp.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index f0fe98e44987..c3aea0750566 100644..100755
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -150,6 +150,17 @@ sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const
// Der Frm besitzt eine Hoehe, mit der er auf die Seite passt.
SwTwips nHeight =
(*fnRect->fnYDiff)( (pFrm->GetUpper()->*fnRect->fnGetPrtBottom)(), nOrigin );
+ // --> OD #i103292#
+ // add additional space taken as lower space as last content in a table
+ // for all text lines expect the last one.
+ {
+ if ( rLine.GetNext() &&
+ pFrm->IsInTab() && !pFrm->GetFollow() && !pFrm->GetIndNext() )
+ {
+ nHeight += pFrm->CalcAddLowerSpaceAsLastInTableCell();
+ }
+ }
+ // <--
// Wenn sich alles innerhalb des bestehenden Frames abspielt,
// ist das Ergebnis sal_True;