diff options
| -rw-r--r-- | sw/inc/crsrsh.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 17 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/delete.cxx | 23 |
3 files changed, 40 insertions, 1 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 58107ded4ebf..d38329f44954 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -721,6 +721,7 @@ public: sal_Bool IsEndSentence() const; bool IsSttPara() const; bool IsEndPara() const; + bool IsEndOfTable() const; ///< at the very last SwPosition inside a table sal_Bool IsStartOfDoc() const; sal_Bool IsEndOfDoc() const; bool IsInFrontOfLabel() const; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 24b2d0e02161..bd1d7499b639 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -975,6 +975,23 @@ bool SwCrsrShell::IsSttPara() const bool SwCrsrShell::IsEndPara() const { return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetCntntNode()->Len(); } +bool SwCrsrShell::IsEndOfTable() const +{ + if (IsTableMode() || IsBlockMode() || !IsEndPara()) + { + return false; + } + SwTableNode const*const pTableNode( IsCrsrInTbl() ); + if (!pTableNode) + { + return false; + } + SwEndNode const*const pEndTableNode(pTableNode->EndOfSectionNode()); + SwNodeIndex const lastNode(*pEndTableNode, -2); + SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), "sw.core", + "text node expected"); + return (lastNode == m_pCurCrsr->GetPoint()->nNode); +} bool SwCrsrShell::IsInFrontOfLabel() const { diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index a97d422e73fd..f19455e0d681 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -456,7 +456,28 @@ long SwWrtShell::DelToEndOfSentence() if(IsEndOfDoc()) return 0; OpenMark(); - long nRet = _FwdSentence() ? Delete() : 0; + long nRet(0); + // fdo#60967: special case that is documented in help: delete + // paragraph following table if cursor is at end of last cell in table + if (IsEndOfTable()) + { + Push(); + ClearMark(); + if (SwCrsrShell::Right(1,CRSR_SKIP_CHARS)) + { + SetMark(); + SwCrsrShell::MovePara(fnParaCurr, fnParaEnd); + if (!IsEndOfDoc()) // do not delete last paragraph in body text + { + nRet = DelFullPara() ? 1 : 0; + } + } + Pop(false); + } + else + { + nRet = _FwdSentence() ? Delete() : 0; + } CloseMark( 0 != nRet ); return nRet; } |