diff options
Diffstat (limited to 'sw/source/core/objectpositioning/anchoredobjectposition.cxx')
| -rw-r--r-- | sw/source/core/objectpositioning/anchoredobjectposition.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
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()) ) |