sw/qa/extras/uiwriter/uiwriter9.cxx | 2 +- sw/source/core/crsr/crsrsh.cxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
New commits: commit b812c5c45b43bb9cf07b7388a08f3152ed3995be Author: Justin Luth <[email protected]> AuthorDate: Mon Jan 5 16:08:42 2026 -0500 Commit: Justin Luth <[email protected]> CommitDate: Thu Jan 8 14:42:50 2026 +0100 tdf#166945 Revert "tdf#111969 sw: ... last half-character for context menu" This reverts 24.8 commit 242f6985556af7aac77b68c6dfea20d4b32c5f52. The problem is that the context menu simply cannot know which choice the user will choose. Some actions DEPEND on the cursor being 'closest to the mouse point' and some actions DEPEND on the cursor being 'inside the character run properties or field'. That 'mouse point at right click' is completely lost as soon as the mouse moves to chose something from the context menu, so it is not available to be re-used by SID_PASTE etc to re-position the cursor before executing the paste. The benefits of the now-being-reverted-patch do not dwarf the already-discovered-downsides, so I'm just reverting to extract myself from this situation. Change-Id: I03943cf899e1d18fb3e736d4cccea159abe7332e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196586 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins (cherry picked from commit f656be88a35e1d4e51ddf131f1454acac4f03739) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196838 diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index 7fb5d255a0b1..5867039d461b 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -386,7 +386,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf111969B) // the test: simulate a right-click of a mouse (at the end-edge of the second N-dash) // which sets the cursor and then acts on that pos. pWrtShell->SwCursorShell::SetCursor(aLogicL, false, /*Block=*/false, /*FieldInfo=*/true); - CPPUNIT_ASSERT(!pWrtShell->GetCurField(true)); + //CPPUNIT_ASSERT(!pWrtShell->GetCurField(true)); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf159049) diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 9068f6ac5aed..bf9472689c89 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1072,7 +1072,6 @@ int SwCursorShell::SetCursor(const Point& rLPt, bool bOnlyText, bool bBlock, bOnlyText ? CursorMoveState::SetOnlyText : CursorMoveState::NONE ); aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable(); aTmpState.m_bFieldInfo = bFieldInfo; // always set cursor at field-start if point is over field - aTmpState.m_bPosMatchesBounds = bFieldInfo; // always set cursor at character-start if over char SwTextNode const*const pTextNd = sw::GetParaPropsNode(*GetLayout(), pCursor->GetPoint()->GetNode());
