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

[Patrick Jaap]

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

New commits:
commit cbbe5c471cad37ab434a11b804c66e0b424af8a7
Author: Patrick Jaap <patj at mail.de>
Date:   Wed Mar 29 11:35:25 2017 +0200

    tdf#101627 disable shrinking for footer textboxes
    
    the shrinking patch a4dee94afed9ade6ac50237c8d99a6e49d3bebc1
    causes problems, if the textboxes are anchored in the
    footer. Therefore, disable it in this case.
    For details, see comments in bug tracker.
    
    Change-Id: I117a99041ff67c19a9de17803ff7864c62afdb50
    Reviewed-on: https://gerrit.libreoffice.org/34517
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 80b9b6761e8cb974e0cdc0c7be0eb95f8745d86f)
    Reviewed-on: https://gerrit.libreoffice.org/35845
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index afd00eb3389a..d369ac46132a 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -486,8 +486,12 @@ SwTwips SwAnchoredObjectPosition::ImplAdjustVertRelPos( const SwTwips nTopOfAnch
             nAdjustedRelPosY = aPgAlignArea.Top() - nTopOfAnch;
         }
 
-        // tdf#91260 - allow textboxes extending beyond the page bottom
-        if ( nAdjustedRelPosY < nProposedRelPosY )
+        // tdf#91260  - allow textboxes extending beyond the page bottom
+        // tdf#101627 - the patch a4dee94afed9ade6ac50237c8d99a6e49d3bebc1
+        //              for tdf#91260 causes problems if the textbox
+        //              is anchored in the footer, so exclude this case
+        if ( !( GetAnchorFrame().GetUpper() && GetAnchorFrame().GetUpper()->IsFooterFrame() )
+             && nAdjustedRelPosY < nProposedRelPosY )
         {
             const SwFrameFormat* pFormat = &(GetFrameFormat());
             if ( SwTextBoxHelper::isTextBox(&GetObject()) )