[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

 sw/source/core/layout/tabfrm.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit 19fe869e21cf643f0359dfe71aec1f104672f027
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jan 16 17:42:39 2012 +0100

    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 at suse.cz>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 983772b..f77e03f 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 )