1 files changed, 97 insertions, 97 deletions

diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index e71a2fc1fa25..b3d00eec2861 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -282,11 +282,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     SwTextFormatColl *const pLocal = pStyle->GetCollection();
     UnoActionContext aAction(pDoc);
     pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, nullptr );
-    SwPaM *pTmpCrsr = &rPaM;
+    SwPaM *pTmpCursor = &rPaM;
     do {
-        pDoc->SetTextFormatColl(*pTmpCrsr, pLocal);
-        pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext());
-    } while ( pTmpCrsr != &rPaM );
+        pDoc->SetTextFormatColl(*pTmpCursor, pLocal);
+        pTmpCursor = static_cast<SwPaM*>(pTmpCursor->GetNext());
+    } while ( pTmpCursor != &rPaM );
     pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, nullptr );
 }
 
@@ -341,19 +341,19 @@ SwUnoCursorHelper::SetPageDesc(
 }
 
 static void
-lcl_SetNodeNumStart(SwPaM & rCrsr, uno::Any const& rValue)
+lcl_SetNodeNumStart(SwPaM & rCursor, uno::Any const& rValue)
 {
     sal_Int16 nTmp = 1;
     rValue >>= nTmp;
     sal_uInt16 nStt = (nTmp < 0 ? USHRT_MAX : (sal_uInt16)nTmp);
-    SwDoc* pDoc = rCrsr.GetDoc();
+    SwDoc* pDoc = rCursor.GetDoc();
     UnoActionContext aAction(pDoc);
 
-    if( rCrsr.GetNext() != &rCrsr )         // MultiSelection?
+    if( rCursor.GetNext() != &rCursor )         // MultiSelection?
     {
         pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, nullptr );
-        SwPamRanges aRangeArr( rCrsr );
-        SwPaM aPam( *rCrsr.GetPoint() );
+        SwPamRanges aRangeArr( rCursor );
+        SwPaM aPam( *rCursor.GetPoint() );
         for( size_t n = 0; n < aRangeArr.Count(); ++n )
         {
           pDoc->SetNumRuleStart(*aRangeArr.SetPam( n, aPam ).GetPoint());
@@ -364,8 +364,8 @@ lcl_SetNodeNumStart(SwPaM & rCrsr, uno::Any const& rValue)
     }
     else
     {
-        pDoc->SetNumRuleStart( *rCrsr.GetPoint());
-        pDoc->SetNodeNumStart( *rCrsr.GetPoint(), nStt );
+        pDoc->SetNumRuleStart( *rCursor.GetPoint());
+        pDoc->SetNodeNumStart( *rCursor.GetPoint(), nStt );
     }
 }
 
@@ -389,7 +389,7 @@ lcl_setCharFormatSequence(SwPaM & rPam, uno::Any const& rValue)
         lcl_setCharStyle(rPam.GetDoc(), aStyle, aSet);
         // the first style should replace the current attributes,
         // all other have to be added
-        SwUnoCursorHelper::SetCrsrAttr(rPam, aSet, (nStyle)
+        SwUnoCursorHelper::SetCursorAttr(rPam, aSet, (nStyle)
                 ? SetAttrMode::DONTREPLACE
                 : SetAttrMode::DEFAULT);
         rPam.GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_START, nullptr);
@@ -617,11 +617,11 @@ SwUnoCursorHelper::GetCurTextFormatColl(SwPaM & rPaM, const bool bConditional)
     static const sal_uLong nMaxLookup = 1000;
     SwFormatColl *pFormat = nullptr;
     bool bError = false;
-    SwPaM *pTmpCrsr = &rPaM;
+    SwPaM *pTmpCursor = &rPaM;
     do
     {
-        const sal_uLong nSttNd = pTmpCrsr->Start()->nNode.GetIndex();
-        const sal_uLong nEndNd = pTmpCrsr->End()->nNode.GetIndex();
+        const sal_uLong nSttNd = pTmpCursor->Start()->nNode.GetIndex();
+        const sal_uLong nEndNd = pTmpCursor->End()->nNode.GetIndex();
 
         if( nEndNd - nSttNd >= nMaxLookup )
         {
@@ -649,8 +649,8 @@ SwUnoCursorHelper::GetCurTextFormatColl(SwPaM & rPaM, const bool bConditional)
             }
         }
 
-        pTmpCrsr = static_cast<SwPaM*>(pTmpCrsr->GetNext());
-    } while ( pTmpCrsr != &rPaM );
+        pTmpCursor = static_cast<SwPaM*>(pTmpCursor->GetNext());
+    } while ( pTmpCursor != &rPaM );
     return (bError) ? nullptr : pFormat;
 }
 
@@ -670,7 +670,7 @@ public:
         : m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR))
         , m_eType(eType)
         , m_xParentText(xParent)
-        , m_pUnoCursor(rDoc.CreateUnoCrsr(rPoint), true)
+        , m_pUnoCursor(rDoc.CreateUnoCursor(rPoint), true)
     {
         if (pMark)
         {
@@ -679,14 +679,14 @@ public:
         }
     }
 
-    SwUnoCrsr& GetCursorOrThrow() {
+    SwUnoCursor& GetCursorOrThrow() {
         if(!m_pUnoCursor)
             throw uno::RuntimeException("SwXTextCursor: disposed or invalid", nullptr);
         return *m_pUnoCursor;
     }
 };
 
-SwUnoCrsr& SwXTextCursor::GetCursor()
+SwUnoCursor& SwXTextCursor::GetCursor()
     { return *m_pImpl->m_pUnoCursor; }
 
 SwPaM const* SwXTextCursor::GetPaM() const
@@ -726,15 +726,15 @@ SwXTextCursor::~SwXTextCursor()
 void SwXTextCursor::DeleteAndInsert(const OUString& rText,
         const bool bForceExpandHints)
 {
-    auto pUnoCrsr = static_cast<SwCursor*>(&(*m_pImpl->m_pUnoCursor));
-    if(pUnoCrsr)
+    auto pUnoCursor = static_cast<SwCursor*>(&(*m_pImpl->m_pUnoCursor));
+    if(pUnoCursor)
     {
         // Start/EndAction
-        SwDoc* pDoc = pUnoCrsr->GetDoc();
+        SwDoc* pDoc = pUnoCursor->GetDoc();
         UnoActionContext aAction(pDoc);
         const sal_Int32 nTextLen = rText.getLength();
         pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, nullptr);
-        auto pCurrent = static_cast<SwCursor*>(pUnoCrsr);
+        auto pCurrent = static_cast<SwCursor*>(pUnoCursor);
         do
         {
             if (pCurrent->HasMark())
@@ -749,12 +749,12 @@ void SwXTextCursor::DeleteAndInsert(const OUString& rText,
                 OSL_ENSURE( bSuccess, "Doc->Insert(Str) failed." );
                 (void) bSuccess;
 
-                SwUnoCursorHelper::SelectPam(*pUnoCrsr, true);
+                SwUnoCursorHelper::SelectPam(*pUnoCursor, true);
                 pCurrent->Left(rText.getLength(),
                         CRSR_SKIP_CHARS, false, false);
             }
             pCurrent = static_cast<SwCursor*>(pCurrent->GetNext());
-        } while (pCurrent != pUnoCrsr);
+        } while (pCurrent != pUnoCursor);
         pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, nullptr);
     }
 }
@@ -890,7 +890,7 @@ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException, std
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (rUnoCursor.HasMark())
     {
@@ -906,7 +906,7 @@ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException, std::
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (rUnoCursor.HasMark())
     {
@@ -923,10 +923,10 @@ sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException, std
     SolarMutexGuard aGuard;
 
     bool bRet = true;
-    auto pUnoCrsr(m_pImpl->m_pUnoCursor);
-    if(pUnoCrsr && pUnoCrsr->GetMark())
+    auto pUnoCursor(m_pImpl->m_pUnoCursor);
+    if(pUnoCursor && pUnoCursor->GetMark())
     {
-        bRet = (*pUnoCrsr->GetPoint() == *pUnoCrsr->GetMark());
+        bRet = (*pUnoCursor->GetPoint() == *pUnoCursor->GetMark());
     }
     return bRet;
 }
@@ -937,7 +937,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     bool bRet = rUnoCursor.Left( nCount, CRSR_SKIP_CHARS, false, false);
@@ -956,7 +956,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     bool bRet = rUnoCursor.Right(nCount, CRSR_SKIP_CHARS, false, false);
@@ -974,7 +974,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException, std::exc
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     if (CURSOR_BODY == m_pImpl->m_eType)
@@ -1030,7 +1030,7 @@ SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException, std::excep
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     if (CURSOR_BODY == m_pImpl->m_eType)
@@ -1064,7 +1064,7 @@ throw (uno::RuntimeException, std::exception)
         throw uno::RuntimeException();
     }
 
-    SwUnoCrsr & rOwnCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rOwnCursor( m_pImpl->GetCursorOrThrow() );
 
     uno::Reference<lang::XUnoTunnel> xRangeTunnel( xRange, uno::UNO_QUERY);
     SwXTextRange* pRange = nullptr;
@@ -1202,7 +1202,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException, s
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const bool bRet =
         rUnoCursor.IsStartWordWT( i18n::WordType::DICTIONARY_WORD );
@@ -1213,7 +1213,7 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException, std
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const bool bRet =
         rUnoCursor.IsEndWordWT( i18n::WordType::DICTIONARY_WORD );
@@ -1225,7 +1225,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException, std::
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // problems arise when a paragraph starts with something other than a word
     bool bRet = false;
@@ -1272,7 +1272,7 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException, s
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // white spaces create problems on the paragraph start
     bool bRet = false;
@@ -1312,7 +1312,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException, std:
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     bool bRet = false;
     SwPosition  *const pPoint     = rUnoCursor.GetPoint();
@@ -1348,7 +1348,7 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException, st
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     bool bRet = false;
     SwPosition  *const pPoint     = rUnoCursor.GetPoint();
@@ -1384,7 +1384,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // start of paragraph?
     bool bRet = rUnoCursor.GetPoint()->nContent == 0;
@@ -1394,10 +1394,10 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException, std::exception)
     if (!bRet && (!rUnoCursor.HasMark() ||
                     *rUnoCursor.GetPoint() == *rUnoCursor.GetMark()))
     {
-        SwCursor aCrsr(*rUnoCursor.GetPoint(),nullptr,false);
-        SwPosition aOrigPos = *aCrsr.GetPoint();
-        aCrsr.GoSentence(SwCursor::START_SENT );
-        bRet = aOrigPos == *aCrsr.GetPoint();
+        SwCursor aCursor(*rUnoCursor.GetPoint(),nullptr,false);
+        SwPosition aOrigPos = *aCursor.GetPoint();
+        aCursor.GoSentence(SwCursor::START_SENT );
+        bRet = aOrigPos == *aCursor.GetPoint();
     }
     return bRet;
 }
@@ -1407,7 +1407,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // end of paragraph?
     bool bRet = rUnoCursor.GetContentNode() &&
@@ -1418,10 +1418,10 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException, std::exception)
     if (!bRet && (!rUnoCursor.HasMark() ||
                     *rUnoCursor.GetPoint() == *rUnoCursor.GetMark()))
     {
-        SwCursor aCrsr(*rUnoCursor.GetPoint(), nullptr, false);
-        SwPosition aOrigPos = *aCrsr.GetPoint();
-        aCrsr.GoSentence(SwCursor::END_SENT);
-        bRet = aOrigPos == *aCrsr.GetPoint();
+        SwCursor aCursor(*rUnoCursor.GetPoint(), nullptr, false);
+        SwPosition aOrigPos = *aCursor.GetPoint();
+        aCursor.GoSentence(SwCursor::END_SENT);
+        bRet = aOrigPos == *aCursor.GetPoint();
     }
     return bRet;
 }
@@ -1431,7 +1431,7 @@ SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException, s
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const bool bWasEOS = isEndOfSentence();
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
@@ -1467,7 +1467,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     bool bRet = rUnoCursor.GoSentence(SwCursor::PREV_SENT);
@@ -1496,7 +1496,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     // if we're at the para start then we wont move
@@ -1519,7 +1519,7 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
     // bRet is true if GoSentence() succeeded or if the
@@ -1543,7 +1543,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException, std::exception
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor);
     return bRet;
@@ -1554,7 +1554,7 @@ SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor);
     return bRet;
@@ -1566,7 +1566,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (CURSOR_META == m_pImpl->m_eType)
     {
@@ -1591,7 +1591,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (CURSOR_META == m_pImpl->m_eType)
     {
@@ -1616,7 +1616,7 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (CURSOR_META == m_pImpl->m_eType)
     {
@@ -1633,7 +1633,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (CURSOR_META == m_pImpl->m_eType)
     {
@@ -1657,7 +1657,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     uno::Reference< text::XTextRange > xRet;
     SwPaM aPam(*rUnoCursor.Start());
@@ -1683,7 +1683,7 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     uno::Reference< text::XTextRange >  xRet;
     SwPaM aPam(*rUnoCursor.End());
@@ -1708,7 +1708,7 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException, std::
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     OUString aText;
     SwUnoCursorHelper::GetTextFromPam(rUnoCursor, aText);
@@ -1720,7 +1720,7 @@ SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
     (void) rUnoCursor; // just to check if valid
 
     const bool bForceExpandHints( (CURSOR_META == m_pImpl->m_eType)
@@ -1747,7 +1747,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
     }
 
     beans::PropertyState eTemp;
-    const bool bDone = SwUnoCursorHelper::getCrsrPropertyValue(
+    const bool bDone = SwUnoCursorHelper::getCursorPropertyValue(
             *pEntry, rPaM, &aAny, eTemp );
 
     if (!bDone)
@@ -1757,7 +1757,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
             RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
             RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
             0L);
-        SwUnoCursorHelper::GetCrsrAttr(rPaM, aSet);
+        SwUnoCursorHelper::GetCursorAttr(rPaM, aSet);
 
         rPropSet.getPropertyValue(*pEntry, aSet, aAny);
     }
@@ -1782,7 +1782,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
 // FN_UNO_PARA_STYLE is known to set attributes for nodes, inside
 // SwUnoCursorHelper::SetTextFormatColl, instead of extending item set.
-// We need to get them from nodes in next call to GetCrsrAttr.
+// We need to get them from nodes in next call to GetCursorAttr.
 // The rest could cause similar problems in theory, so we just list them here.
 inline bool propertyCausesSideEffectsInNodes(sal_uInt16 nWID)
 {
@@ -1851,7 +1851,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 
             // we need to get up-to-date item set from nodes
             if (i == 0 || bPreviousPropertyCausesSideEffectsInNodes)
-                SwUnoCursorHelper::GetCrsrAttr(rPaM, aItemSet);
+                SwUnoCursorHelper::GetCursorAttr(rPaM, aItemSet);
 
             const uno::Any &rValue = rPropertyValues[i].Value;
             // this can set some attributes in nodes' mpAttrSet
@@ -1859,7 +1859,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
                 rPropSet.setPropertyValue(*pEntry, rValue, aItemSet);
 
             if (i + 1 == aEntries.size() || bPropertyCausesSideEffectsInNodes)
-                SwUnoCursorHelper::SetCrsrAttr(rPaM, aItemSet, nAttrMode, bTableMode);
+                SwUnoCursorHelper::SetCursorAttr(rPaM, aItemSet, nAttrMode, bTableMode);
 
             bPreviousPropertyCausesSideEffectsInNodes = bPropertyCausesSideEffectsInNodes;
         }
@@ -1925,7 +1925,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
             if ( pEntry->nWID >= FN_UNO_RANGE_BEGIN &&
                  pEntry->nWID <= FN_UNO_RANGE_END )
             {
-                (void)SwUnoCursorHelper::getCrsrPropertyValue(
+                (void)SwUnoCursorHelper::getCursorPropertyValue(
                     *pEntry, rPaM, nullptr, pStates[i] );
             }
             else
@@ -1954,7 +1954,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
                                 0L ));
                     }
                     // #i63870#
-                    SwUnoCursorHelper::GetCrsrAttr( rPaM, *pSet );
+                    SwUnoCursorHelper::GetCursorAttr( rPaM, *pSet );
                 }
 
                 pStates[i] = ( pSet->Count() )
@@ -1968,7 +1968,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
                     {
                         pSetParent.reset( pSet->Clone( false ) );
                         // #i63870#
-                        SwUnoCursorHelper::GetCrsrAttr(
+                        SwUnoCursorHelper::GetCursorAttr(
                                 rPaM, *pSetParent, true, false );
                     }
 
@@ -2001,7 +2001,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
     // if we are reseting paragraph attributes, we need to select the full paragraph first
     SwPosition aStart = *rPaM.Start();
     SwPosition aEnd = *rPaM.End();
-    auto pTemp ( rDoc.CreateUnoCrsr(aStart) );
+    auto pTemp ( rDoc.CreateUnoCursor(aStart) );
     if(!SwUnoCursorHelper::IsStartOfPara(*pTemp))
     {
         pTemp->MovePara(fnParaCurr, fnParaStart);
@@ -2053,7 +2053,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
     }
     else
     {
-        SwUnoCursorHelper::resetCrsrPropertyValue(*pEntry, rPaM);
+        SwUnoCursorHelper::resetCursorPropertyValue(*pEntry, rPaM);
     }
 }
 
@@ -2090,7 +2090,7 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception
     static uno::Reference< beans::XPropertySetInfo >  xRef;
     if(!xRef.is())
     {
-        static SfxItemPropertyMapEntry const aCrsrExtMap_Impl[] =
+        static SfxItemPropertyMapEntry const aCursorExtMap_Impl[] =
         {
             { OUString(UNO_NAME_IS_SKIP_HIDDEN_TEXT), FN_SKIP_HIDDEN_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
             { OUString(UNO_NAME_IS_SKIP_PROTECTED_TEXT), FN_SKIP_PROTECTED_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE,     0},
@@ -2101,7 +2101,7 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception
         // extend PropertySetInfo!
         const uno::Sequence<beans::Property> aPropSeq = xInfo->getProperties();
         xRef = new SfxExtItemPropertySetInfo(
-            aCrsrExtMap_Impl,
+            aCursorExtMap_Impl,
             aPropSeq );
     }
     return xRef;
@@ -2116,7 +2116,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (rPropertyName == UNO_NAME_IS_SKIP_HIDDEN_TEXT)
     {
@@ -2150,7 +2150,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     uno::Any aAny;
     if (rPropertyName == UNO_NAME_IS_SKIP_HIDDEN_TEXT)
@@ -2217,7 +2217,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const beans::PropertyState eRet = SwUnoCursorHelper::GetPropertyState(
             rUnoCursor, m_pImpl->m_rPropSet, rPropertyName);
@@ -2231,7 +2231,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     return SwUnoCursorHelper::GetPropertyStates(
             rUnoCursor, m_pImpl->m_rPropSet, rPropertyNames);
@@ -2271,7 +2271,7 @@ void SAL_CALL SwXTextCursor::setPropertyValues(
 
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     // a little lame to have to copy into this.
     uno::Sequence< beans::PropertyValue > aPropertyValues( aValues.getLength() );
@@ -2372,7 +2372,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     std::set<sal_uInt16> aParaWhichIds;
     std::set<sal_uInt16> aWhichIds;
@@ -2396,7 +2396,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const sal_Int32 nCount = rPropertyNames.getLength();
     if ( nCount )
@@ -2440,7 +2440,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
             }
             else if (pEntry->nWID == FN_UNO_NUM_START_VALUE)
             {
-                SwUnoCursorHelper::resetCrsrPropertyValue(*pEntry, rUnoCursor);
+                SwUnoCursorHelper::resetCursorPropertyValue(*pEntry, rUnoCursor);
             }
         }
 
@@ -2463,7 +2463,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const sal_Int32 nCount = rPropertyNames.getLength();
     uno::Sequence< uno::Any > aRet(nCount);
@@ -2503,7 +2503,7 @@ throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwNode& node = rUnoCursor.GetNode();
 
@@ -2544,7 +2544,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::makeRedline(rUnoCursor, rRedlineType, rRedlineProperties);
 }
@@ -2556,7 +2556,7 @@ throw (lang::IllegalArgumentException, io::IOException,
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     SwUnoCursorHelper::InsertFile(&rUnoCursor, rURL, rOptions);
 }
@@ -2892,7 +2892,7 @@ SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor)
 {
     SolarMutexGuard aGuard;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     if (rUnoCursor.HasMark())
     {
@@ -2937,7 +2937,7 @@ throw (uno::RuntimeException, std::exception)
     SolarMutexGuard g;
     if (rServiceName != "com.sun.star.text.TextContent")
         throw uno::RuntimeException();
-    SwUnoCrsr& rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor& rUnoCursor( m_pImpl->GetCursorOrThrow() );
     return SwXParaFrameEnumeration::Create(rUnoCursor, PARAFRAME_PORTION_TEXTRANGE);
 }
 
@@ -2946,7 +2946,7 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
-    SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() );
+    SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
 
     const uno::Reference<lang::XUnoTunnel> xTunnel(
             m_pImpl->m_xParentText, uno::UNO_QUERY);
@@ -2961,11 +2961,11 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception)
         throw uno::RuntimeException();
     }
 
-    auto pNewCrsr(rUnoCursor.GetDoc()->CreateUnoCrsr(*rUnoCursor.GetPoint()) );
+    auto pNewCursor(rUnoCursor.GetDoc()->CreateUnoCursor(*rUnoCursor.GetPoint()) );
     if (rUnoCursor.HasMark())
     {
-        pNewCrsr->SetMark();
-        *pNewCrsr->GetMark() = *rUnoCursor.GetMark();
+        pNewCursor->SetMark();
+        *pNewCursor->GetMark() = *rUnoCursor.GetMark();
     }
     const CursorType eSetType = (CURSOR_TBLTEXT == m_pImpl->m_eType)
             ? CURSOR_SELECTION_IN_TABLE : CURSOR_SELECTION;
@@ -2974,7 +2974,7 @@ SwXTextCursor::createEnumeration() throw (uno::RuntimeException, std::exception)
             : nullptr);
     SwTable const*const pTable(
             (pStartNode) ? & pStartNode->GetTable() : nullptr );
-    return SwXParagraphEnumeration::Create(pParentText, pNewCrsr, eSetType, pStartNode, pTable);
+    return SwXParagraphEnumeration::Create(pParentText, pNewCursor, eSetType, pStartNode, pTable);
 }
 
 uno::Type SAL_CALL