[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
matteocam
matteo.campanelli at gmail.com
Mon Jun 22 11:18:09 PDT 2015
svx/source/svdraw/svdotext.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 14e4ea9c23c874ee9faabc6ed1f97ed5d2838f15
Author: matteocam <matteo.campanelli at gmail.com>
Date: Mon Jun 22 14:16:06 2015 -0400
Reducing FSM size: set IsUF=0 at UF-caused OF
Change-Id: Ib89e50f073414c8280a1eb0768f4e78ff9d5af17
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 5b6d9a7..02c1519 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1974,12 +1974,16 @@ void SdrTextObj::onOverflowStatusEvent( )
// If this is the a post-underflow-type of overflow then we cannot
// trust the editing outl on the text since it has still the old one
if(GetTextChain()->GetLinkHandlingUnderflow(this)) {
+ // XXX: Maybe you can get this info directly from editing outl?
OutlinerParaObject *pPObj = GetOutlinerParaObject();
aDrawOutliner.SetUpdateMode(true);
aDrawOutliner.SetMaxAutoPaperSize(pEdtOutl->GetMaxAutoPaperSize());
aDrawOutliner.SetText(*pPObj);
aDrawOutliner.IsPageOverflow(); // Check for overflow to set flags
mpOverflowingText = aDrawOutliner.GetOverflowingText();
+
+ // reset underflow handling
+ GetTextChain()->SetLinkHandlingUnderflow(this, false);
} else if (pEdtOutl != NULL)
mpOverflowingText = pEdtOutl->GetOverflowingText();
else {
More information about the Libreoffice-commits
mailing list