summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-06-04 18:15:12 +0200
committerLászló Németh <laszlo.nemeth@collabora.com>2015-06-04 18:21:51 +0200
commit2f779fc046c9afec04b4a4500b213e77aee51ae1 (patch)
tree3ad23e9271033cd280dcf05359f962176103d099
parent76a9afc9da110dbf3a00a628311a0b5d9aa6d2bc (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. Change-Id: Iaff64ff4953adbfa830832da146343cef2734547
-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