svx/source/svdraw/textchainflow.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 07690343de9fae1484b8fc0c1f8d2e1767b8e1be Author: matteocam <matteo.campane...@gmail.com> Date: Tue Jul 14 17:34:05 2015 -0400 Underflow can overflow cursor Change-Id: Iff8b9f76402a358bb9d90ad712e3a6ede897a6bb diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index fe4f9fc..20c26b6 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -128,7 +128,7 @@ void TextChainFlow::impUpdateCursorInfo() // XXX: Maybe we can get rid of mbOFisUFinduced by not allowing handling of more than one event by the same TextChainFlow // if this is not an OF triggered during an UF - mbPossiblyCursorOut = bOverflow && !mbOFisUFinduced; + mbPossiblyCursorOut = bOverflow /* && !mbOFisUFinduced */; // XXX: Not sure we need !mbOFisUFinduced if (mbPossiblyCursorOut) { // if this is false, mpOverflChText might be NULL maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel()); // After the chaining event the cursor is where the text from the source box merged with the rest @@ -206,6 +206,7 @@ void TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl) pNonOverflOutl->SetText(*pNewText); mpTargetLink->NbcSetOutlinerParaObject(pNewText); + // For some reason the paper size is lost after last instruction, so we set it. pNonOverflOutl->SetPaperSize(Size(pNonOverflOutl->GetPaperSize().Width(), pNonOverflOutl->GetTextHeight())); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits