Kaydet (Commit) 16331514 authored tarafından László Németh's avatar László Németh

tdf#92648 fix DOCX import regression (textbox shrinking in footers)

caused by the fix for tdf#91260

Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d
üst 63d2d50e
...@@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc ...@@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc
SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject()); SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
SwFormatFrmSize aSize(pFormat->GetFrmSize()); SwFormatFrmSize aSize(pFormat->GetFrmSize());
SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY); SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY);
aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 ); if (nShrinked >= 0) {
pFrameFormat->SetFormatAttr(aSize); aSize.SetHeight( nShrinked );
pFrameFormat->SetFormatAttr(aSize);
}
nAdjustedRelPosY = nProposedRelPosY; nAdjustedRelPosY = nProposedRelPosY;
} else if ( SwTextBoxHelper::findTextBox(pFormat) ) } else if ( SwTextBoxHelper::findTextBox(pFormat) )
// when the shape has a textbox, use only the proposed vertical position // when the shape has a textbox, use only the proposed vertical position
......
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