[Libreoffice-commits] core.git: sw/source

[Justin Luth]

 sw/source/core/objectpositioning/anchoredobjectposition.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 892c719fffa06de4c7aeab497326cad7bae9e5c6
Author: Justin Luth <justin_luth at sil.org>
Date:   Wed Sep 20 20:44:01 2017 -0400

    Revert "tdf#108932 - prevent textbox shrink from actually growing"
    
    This reverts commit b55d86610128d0b6f8d0fea7c9a3e9d5acd4c878 which
    was a trial attemp to fix a regression from tdf#91260.
    
    Not reverting my jenkins comment that "Actually, I think that
    the regression commit ought to be fully reverted. It "fixes" such
    a strange situation and seems to have a lot of unintended
    repercussions. Just look at tdf#91260 and see all of the
    additional patches."
    
    Change-Id: I6852f6d494f48f68eefc39019c44f2cbd96ec5a5
    Reviewed-on: https://gerrit.libreoffice.org/42827
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index abc898e6bf2c..a865228d5b4f 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -489,9 +489,7 @@ SwTwips SwAnchoredObjectPosition::ImplAdjustVertRelPos( const SwTwips nTopOfAnch
         // tdf#101627 - the patch a4dee94afed9ade6ac50237c8d99a6e49d3bebc1
         //              for tdf#91260 causes problems if the textbox
         //              is anchored in the footer, so exclude this case
-        // tdf#108932 - ensure that the adjustment will only shrink (> 0)
         if ( !( GetAnchorFrame().GetUpper() && GetAnchorFrame().GetUpper()->IsFooterFrame() )
-             && nAdjustedRelPosY > 0
              && nAdjustedRelPosY < nProposedRelPosY )
         {
             const SwFrameFormat* pFormat = &(GetFrameFormat());