summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-06-04 18:15:12 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-06-09 18:46:44 +0000
commit062256ba6810fb1cbed54246dde7570ed5430aa4 (patch)
treeb8cc11b78c2687acbeb0a914b642b9c7ec0c58e9
parentab78b52b249bfd32892786c51d93bfd61a4db371 (diff)
tdf#91260: cleanup - textboxes extending beyond the page
Storing Undo data is unnecessary here, because shrinking is applied only on the text frame of the textbox. The shape component of the textbox isn't modified. (cherry-picked from 2f779fc046c9afec04b4a4500b213e77aee51ae1) Change-Id: Iaff64ff4953adbfa830832da146343cef2734547 Reviewed-on: https://gerrit.libreoffice.org/16088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 2957aa073359..b4e63e36d8ae 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -482,13 +482,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc
{
// shrink textboxes to extend beyond the page bottom
SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
- SfxItemSet aTextBoxSet(pFrameFormat->GetDoc()->GetAttrPool(), aFrameFormatSetRange);
SwFormatFrmSize aSize(pFormat->GetFrmSize());
SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY);
aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
- aTextBoxSet.Put(aSize);
- if (aTextBoxSet.Count())
- pFrameFormat->GetDoc()->SetFlyFrmAttr(*pFrameFormat, aTextBoxSet);
+ pFrameFormat->SetFormatAttr(aSize);
nAdjustedRelPosY = nProposedRelPosY;
} else if ( SwTextBoxHelper::findTextBox(pFormat) )
// when the shape has a textbox, use only the proposed vertical position