Kaydet (Commit) 892c719f authored tarafından Justin Luth's avatar Justin Luth

Revert "tdf#108932 - prevent textbox shrink from actually growing"

This reverts commit b55d8661 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/42827Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
üst 46509204
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment