editeng/source/editeng/impedit3.cxx | 1 +
svx/source/svdraw/svdotext.cxx | 3 ---
svx/source/svdraw/svdotxed.cxx | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit ff6679cf9410bdcce2a47228d1a8ece4f168a046
Author: matteocam <matteo.campane...@gmail.com>
Date: Thu Aug 7 18:10:57 2014 +0200
Debugging output for Overflowing paragraph
Change-Id: I0ac2fc1da4d70d8f382d4652934ceb63944dd3fc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index db1aad8..a6a21ae 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -429,6 +429,7 @@ void ImpEditEngine::FormatDoc()
// FIXME(matteocam)
// set possible point for chainging
mnOverflowingPara = nPara;
+ fprintf(stderr, "[CHAINING] Setting first overflowing para:
%d\n", nPara);
}
// InvalidRect set only once...
commit f5a1c7c94ddd06d44393db4cec2a4912075dde00
Author: matteocam <matteo.campane...@gmail.com>
Date: Thu Aug 7 18:01:26 2014 +0200
Check whether text box is not its own next link in chain
Change-Id: I440856afa23ef77b65df0b8e77482383bfc54934
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d70995b..cbdec1e 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1947,11 +1947,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
}
else if ( GetNextLinkInChain() != NULL &&
pEditStatus->IsPageOverflow())
{
- // FIXME(matteocam): should include check that the TextBox has a
next chain link
-
// set the need for chaining
SetToBeChained( true );
-
//impDecomposeChainedTextPrimitive();
}
}
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index cffa559..76d3296 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -261,7 +261,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
// FIXME(matteocam)
// TODO: move this to one level higher
- if ( IsToBeChained() )
+ if ( IsToBeChained() && GetNextLinkInChain() != this) // XXX:
defensive check
{
// set non overflow part of text to current box
pNewText = rOutl.GetNonOverflowingParaObject();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
