[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Bjoern Michaelsen]

 sw/source/core/text/frmform.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit a54da6a84f751250c694120d1a29aaac89cd3af4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Mar 15 16:25:41 2014 +0100

    fdo#47355: partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22
    
    - that commit claimed to fix i#84870
    - however that example document _still_ loops for me on current master
      even with the change
    - this caused the fdo#47355 regression in addition
    - thus reverting to heal fdo#47355, expecting i#84870 unchanged as broken
      before and in need of a proper fix
    
    Change-Id: I067a8ef222ee2af6cd97579451c40ddba53ca294
    Reviewed-on: https://gerrit.libreoffice.org/8606
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    (cherry picked from commit 72a4987434368bfb0b15f5ebb70a52108d349d5f)
    Reviewed-on: https://gerrit.libreoffice.org/8617

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 4291e92..093e40b 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1059,14 +1059,6 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine,
     const SwTwips nDocPrtTop = Frm().Top() + Prt().Top();
     const SwTwips nOldHeight = Prt().SSize().Height();
     SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight;
-    // --> OD #i84870# - no shrink of text frame, if it only contains one
-    // as-character anchored object.
-    if ( nChg < 0 &&
-         bOnlyContainsAsCharAnchoredObj )
-    {
-        nChg = 0;
-    }
-    // <--
 
     // Vertical Formatting:
     // The (rotated) repaint rectangle's x coordinate referes to the frame.