summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-01-16 17:42:39 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-05-04 09:17:42 +0200
commit19fe869e21cf643f0359dfe71aec1f104672f027 (patch)
tree6ed608e7c947a830b69ad0901eae49bf8d6f7aac
parent3ee18325cf8c06c04296173619f4535671e391e9 (diff)
remove pointless forward moving of a table (bnc#706138)
This appears to be broken. Why should a table where all rows want to be kept together be moved one page forward just because there is something before it on the page where it is? It either fits its curent page, in which case it's wrong, or it does not fit, in which case it may not fit the following page either and something else needs to take care of it anyway. (cherry picked from commit 254ba40392b17c2cb2fa1ef35a835d19a5f4a5e1) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r--sw/source/core/layout/tabfrm.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 983772b837f3..f77e03fe6a4b 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2403,11 +2403,6 @@ void SwTabFrm::MakeAll()
++nMinNumOfLines;
pTmpRow = static_cast<const SwRowFrm*>(pTmpRow->GetNext());
}
- // Check if all lines want to keep together and we
- // have a pIndPrev. In this case we set nDeadLine
- // to 0, forcing the table to move forward.
- if ( !pTmpRow && pIndPrev )
- nDeadLine = 0;
}
if ( !bTryToSplit )