svx/source/svdraw/textchainflow.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 3f5c5eb2942f8aa7e31401a302899cc492f17519
Author: matteocam <matteo.campane...@gmail.com>
Date: Tue Jul 14 18:52:03 2015 -0400
Update postChainging position properly for both UF/OF
Change-Id: I1607338bcc0fd5938e383ec2f3df451c9f8d91a8
diff --git a/svx/source/svdraw/textchainflow.cxx
b/svx/source/svdraw/textchainflow.cxx
index a6b8b1d..607a2d6 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -127,18 +127,16 @@ void TextChainFlow::impUpdateCursorInfo()
mbPossiblyCursorOut = bOverflow;
- if (mbPossiblyCursorOut && !mbOFisUFinduced) { // 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
- maPostChainingSel = ESelection(mpOverflChText->GetInsertionPointSel());
- } else if(mbPossiblyCursorOut && mbOFisUFinduced) {
+ if(mbPossiblyCursorOut ) {
maOverflowPosSel = ESelection(mpOverflChText->GetOverflowPointSel());
ESelection aSelAtUFTime =
GetTextChain()->GetPreChainingSel(GetLinkTarget());
// Might be an invalid selection if the cursor at UF time was before
- // the (UF-induced) Overflowing point but we don't use it in that
case
+ // the (possibly UF-induced) Overflowing point but we don't use it
in that case
maPostChainingSel =
ESelection(aSelAtUFTime.nStartPara-maOverflowPosSel.nStartPara,
aSelAtUFTime.nStartPos-maOverflowPosSel.nStartPos );
}
+
+ // XXX: It may not be necessary anymore to keep this method separated from
EditingTextChainFlow::impBroadcastCursorInfo
}
void TextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
