diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-11-06 14:54:02 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-10 07:32:48 +0000 |
| commit | 98ef16db0d228ebc0e7bad0290dcc9d3f1d6469b (patch) | |
| tree | b74089c79c41dcd6e984c3de51b1ba7e7a538bdc /sw | |
| parent | cf4b042c934913785ea8886b6a6b3871926c53a3 (diff) | |
tdf#92648 fix DOCX import regression (textbox shrinking in footers)
caused by the fix for tdf#91260
(cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0)
Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d
Reviewed-on: https://gerrit.libreoffice.org/19877
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/objectpositioning/anchoredobjectposition.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index b4e63e36d8ae..ee354ce558e6 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject()); SwFormatFrmSize aSize(pFormat->GetFrmSize()); SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY); - aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 ); - pFrameFormat->SetFormatAttr(aSize); + if (nShrinked >= 0) { + aSize.SetHeight( nShrinked ); + pFrameFormat->SetFormatAttr(aSize); + } nAdjustedRelPosY = nProposedRelPosY; } else if ( SwTextBoxHelper::findTextBox(pFormat) ) // when the shape has a textbox, use only the proposed vertical position |