summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-05-29 22:53:16 +0200
committerMichael Stahl <mstahl@redhat.com>2017-05-30 15:08:46 +0200
commitc3a09bc2025c8cb3c52d45f6a65152d1aebf0536 (patch)
tree5afe24fded899b9340fca370e92291a6d919943c
parent1730bcf18a9a0ed27ed700d3b6ac0545d3cef283 (diff)
tdf#96256 sw: fix scrolling to cursor after paste
The mnStartAction hack in commit 587006cac508616f486aea45e265a170bcccdc87 has a surprising effect on SwViewShell::SizeChgNotify(), as it causes PageNumNotify() to be called instead of SizeNotify() if pages are inserted while layouting in GetCharRect(). Now SwCursorShell::UpdateCursor(SCROLLWIN) would no longer scroll to the cursor position, which is a problem for clipboard paste. Try to fix this by calling UISizeNotify() manually, which seems to work. Change-Id: Id08bfe2964564c02fe9d1ef0176939ab3eeb187a (cherry picked from commit 6f1530bfdefc8e4deabf37ab337e09a89d3841b3) Reviewed-on: https://gerrit.libreoffice.org/38204 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/core/crsr/crsrsh.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index d88d76272a56..bfc6cd1cc8ed 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1770,6 +1770,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState );
}
--mnStartAction;
+ UISizeNotify(); // tdf#96256 update view size
if( !pShellCursor->HasMark() )
m_aCursorHeight = aTmpState.m_aRealHeight;