sw/inc/crsrsh.hxx | 1 -
sw/source/core/crsr/crsrsh.cxx | 7 -------
sw/source/core/crsr/viscrs.cxx | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 8da753752898984425c98a7f3db02b1aa69b74c8
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Oct 1 13:53:49 2024 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Oct 1 14:07:11 2024 +0200
Revert "Prevent cursor invalidation if the cursor position doesn't change."
This reverts commit 6a2071cafae41afdfde56b07817d8674482431f6.
Reason for revert: This was causing cypress fails on the online side
eg. `make -C cypress_test check-desktop spec=writer/table_operation_spec.js`
Change-Id: Ieb1aee314f550bcc49a0b41682a6a475dfbf6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174323
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 5cf244aa6b4e..97248572c762 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -237,7 +237,6 @@ private:
bool m_bBasicHideCursor : 1; // true -> HideCursor from Basic
bool m_bSetCursorInReadOnly : 1;// true -> Cursor is allowed in
ReadOnly-Areas
bool m_bOverwriteCursor : 1; // true -> show Overwrite Cursor
- bool m_bIsCursorPosChanged : 1; // true -> if the cursor position is
changed last cursor update
// true -> send accessible events when cursor changes
// (set to false when using internal-only helper cursor)
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index c8462c71a7cc..20e32e66c255 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1921,7 +1921,6 @@ class SwNotifyAccAboutInvalidTextSelections
void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
{
- Point nOldPos = m_pCurrentCursor->GetPtPos();
CurrShell aCurr( this );
ClearUpCursors();
@@ -2416,10 +2415,6 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags,
bool bIdleEnd )
GetOut()->SetSettings( aSettings );
}
- // Do not notify the cursor if the position didn't change
- Point nNewPos = m_pCurrentCursor->GetPtPos();
- m_bIsCursorPosChanged = nOldPos != nNewPos;
-
if( m_bSVCursorVis )
m_pVisibleCursor->Show(); // show again
@@ -2427,7 +2422,6 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool
bIdleEnd )
sendLOKCursorUpdates();
getIDocumentMarkAccess()->NotifyCursorUpdate(*this);
- m_bIsCursorPosChanged = false; // reset to default
}
void SwCursorShell::sendLOKCursorUpdates()
@@ -3346,7 +3340,6 @@ SwCursorShell::SwCursorShell( SwCursorShell& rShell,
vcl::Window *pInitWin )
m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCursor =
m_bOverwriteCursor = false;
- m_bIsCursorPosChanged = false;
m_bSendAccessibleCursorEvents = true;
m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
m_bSVCursorVis = true;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index a61d17c84624..3224893d81bb 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -247,7 +247,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const *
pViewShell)
LOK_CALLBACK_INVALIDATE_VIEW_CURSOR);
}
}
- else if (m_pCursorShell->m_bIsCursorPosChanged)
+ else
{
SfxLokHelper::notifyUpdatePerViewId(m_pCursorShell->GetSfxViewShell(),
SfxViewShell::Current(),
m_pCursorShell->GetSfxViewShell(),
LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR);
