567 files changed, 26894 insertions, 26894 deletions

diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8faf03b222ff..64315c280bbc 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -60,16 +60,16 @@ bool SwAccessibleCell::IsSelected()
     assert(GetMap());
     const SwViewShell *pVSh = GetMap()->GetShell();
     assert(pVSh);
-    if( dynamic_cast<const SwCrsrShell*>( pVSh) !=  nullptr )
+    if( dynamic_cast<const SwCursorShell*>( pVSh) !=  nullptr )
     {
-        const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
+        const SwCursorShell *pCSh = static_cast< const SwCursorShell * >( pVSh );
         if( pCSh->IsTableMode() )
         {
-            const SwCellFrm *pCFrm =
-                static_cast< const SwCellFrm * >( GetFrm() );
+            const SwCellFrame *pCFrame =
+                static_cast< const SwCellFrame * >( GetFrame() );
             SwTableBox *pBox =
-                const_cast< SwTableBox *>( pCFrm->GetTabBox() );
-            SwSelBoxes const& rBoxes(pCSh->GetTableCrsr()->GetSelectedBoxes());
+                const_cast< SwTableBox *>( pCFrame->GetTabBox() );
+            SwSelBoxes const& rBoxes(pCSh->GetTableCursor()->GetSelectedBoxes());
             bRet = rBoxes.find(pBox) != rBoxes.end();
         }
     }
@@ -84,7 +84,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
     // SELECTABLE
     const SwViewShell *pVSh = GetMap()->GetShell();
     assert(pVSh);
-    if( dynamic_cast<const SwCrsrShell*>( pVSh) !=  nullptr )
+    if( dynamic_cast<const SwCursorShell*>( pVSh) !=  nullptr )
         rStateSet.AddState( AccessibleStateType::SELECTABLE );
     //Add resizable state to table cell.
     rStateSet.AddState( AccessibleStateType::RESIZABLE );
@@ -100,13 +100,13 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
 }
 
 SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap,
-                                    const SwCellFrm *pCellFrm )
-    : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
+                                    const SwCellFrame *pCellFrame )
+    : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrame )
     , aSelectionHelper( *this )
     , bIsSelected( false )
 {
     SolarMutexGuard aGuard;
-    OUString sBoxName( pCellFrm->GetTabBox()->GetName() );
+    OUString sBoxName( pCellFrame->GetTabBox()->GetName() );
     SetName( sBoxName );
 
     bIsSelected = IsSelected();
@@ -151,16 +151,16 @@ bool SwAccessibleCell::_InvalidateMyCursorPos()
     return bChanged;
 }
 
-bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
+bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame )
 {
     bool bChanged = false;
 
-    const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *GetMap() );
+    const SwAccessibleChildSList aVisList( GetVisArea(), *pFrame, *GetMap() );
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
     while( aIter != aVisList.end() )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         if( pLower )
         {
             if( rLower.IsAccessible( GetMap()->GetShell()->IsPreview() )  )
@@ -169,7 +169,7 @@ bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
                     GetMap()->GetContextImpl( pLower, false ) );
                 if( xAccImpl.is() )
                 {
-                    assert(xAccImpl->GetFrm()->IsCellFrm());
+                    assert(xAccImpl->GetFrame()->IsCellFrame());
                     bChanged = static_cast< SwAccessibleCell *>(
                             xAccImpl.get() )->_InvalidateMyCursorPos();
                 }
@@ -195,9 +195,9 @@ void SwAccessibleCell::_InvalidateCursorPos()
     if (IsSelected())
     {
         const SwAccessibleChild aChild( GetChild( *(GetMap()), 0 ) );
-        if( aChild.IsValid()  && aChild.GetSwFrm() )
+        if( aChild.IsValid()  && aChild.GetSwFrame() )
         {
-            ::rtl::Reference < SwAccessibleContext > xChildImpl( GetMap()->GetContextImpl( aChild.GetSwFrm())  );
+            ::rtl::Reference < SwAccessibleContext > xChildImpl( GetMap()->GetContextImpl( aChild.GetSwFrame())  );
             if (xChildImpl.is())
             {
                 AccessibleEventObject aEvent;
@@ -208,16 +208,16 @@ void SwAccessibleCell::_InvalidateCursorPos()
         }
     }
 
-    const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
-    assert(pParent->IsTabFrm());
-    const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( pParent );
-    if( pTabFrm->IsFollow() )
-        pTabFrm = pTabFrm->FindMaster();
+    const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
+    assert(pParent->IsTabFrame());
+    const SwTabFrame *pTabFrame = static_cast< const SwTabFrame * >( pParent );
+    if( pTabFrame->IsFollow() )
+        pTabFrame = pTabFrame->FindMaster();
 
-    while( pTabFrm )
+    while( pTabFrame )
     {
-        _InvalidateChildrenCursorPos( pTabFrm );
-        pTabFrm = pTabFrm->GetFollow();
+        _InvalidateChildrenCursorPos( pTabFrame );
+        pTabFrame = pTabFrame->GetFollow();
     }
     if (m_pAccTable.is())
     {
@@ -265,21 +265,21 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
 
 void SwAccessibleCell::Dispose( bool bRecursive )
 {
-    const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
+    const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
     ::rtl::Reference< SwAccessibleContext > xAccImpl(
             GetMap()->GetContextImpl( pParent, false ) );
     if( xAccImpl.is() )
-        xAccImpl->DisposeChild( SwAccessibleChild(GetFrm()), bRecursive );
+        xAccImpl->DisposeChild( SwAccessibleChild(GetFrame()), bRecursive );
     SwAccessibleContext::Dispose( bRecursive );
 }
 
 void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
 {
-    const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
+    const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
     ::rtl::Reference< SwAccessibleContext > xAccImpl(
             GetMap()->GetContextImpl( pParent, false ) );
     if( xAccImpl.is() )
-        xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrm()), rOldBox );
+        xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrame()), rOldBox );
     SwAccessibleContext::InvalidatePosOrSize( rOldBox );
 }
 
@@ -339,11 +339,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
 
 SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
 {
-    assert(GetFrm());
-    assert(GetFrm()->IsCellFrm());
+    assert(GetFrame());
+    assert(GetFrame()->IsCellFrame());
 
-    const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
-    return pCellFrm->GetTabBox()->GetFrameFormat();
+    const SwCellFrame* pCellFrame = static_cast<const SwCellFrame*>( GetFrame() );
+    return pCellFrame->GetTabBox()->GetFrameFormat();
 }
 
 //Implement TableCell currentValue
@@ -437,7 +437,7 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
 {
     SolarMutexGuard g;
 
-    const SvxBrushItem &rBack = GetFrm()->GetAttrSet()->GetBackground();
+    const SvxBrushItem &rBack = GetFrame()->GetAttrSet()->GetBackground();
     sal_uInt32 crBack = rBack.GetColor().GetColor();
 
     if (COL_AUTO == crBack)
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 6814270b172b..6d66f33e35b9 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <accselectionhelper.hxx>
 
-class SwCellFrm;
+class SwCellFrame;
 class SwAccessibleTable;
 class SwFrameFormat;
 
@@ -40,7 +40,7 @@ class SwAccessibleCell : public SwAccessibleContext,
     bool    IsSelected();
 
     bool _InvalidateMyCursorPos();
-    bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
+    bool _InvalidateChildrenCursorPos( const SwFrame *pFrame );
 
     rtl::Reference<SwAccessibleTable> m_pAccTable;
 
@@ -54,7 +54,7 @@ protected:
     virtual ~SwAccessibleCell();
 
 public:
-    SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
+    SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrame *pCellFrame );
 
     virtual bool HasCursor() override;   // required by map to remember that object
 
@@ -85,7 +85,7 @@ public:
 
     virtual void Dispose( bool bRecursive = false ) override;
 
-    virtual void InvalidatePosOrSize( const SwRect& rFrm ) override;
+    virtual void InvalidatePosOrSize( const SwRect& rFrame ) override;
 
     // XInterface
 
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index f10e16acd7dc..e200104967dc 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -97,43 +97,43 @@ vcl::Window *SwAccessibleContext::GetWindow()
 }
 
 // get SwViewShell from accessibility map, and cast to cursor shell
-SwCrsrShell* SwAccessibleContext::GetCrsrShell()
+SwCursorShell* SwAccessibleContext::GetCursorShell()
 {
-    SwCrsrShell* pCrsrShell;
+    SwCursorShell* pCursorShell;
     SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : nullptr;
     OSL_ENSURE( pViewShell, "no view shell" );
-    if( pViewShell && dynamic_cast<const SwCrsrShell*>( pViewShell) !=  nullptr )
-        pCrsrShell = static_cast<SwCrsrShell*>( pViewShell );
+    if( pViewShell && dynamic_cast<const SwCursorShell*>( pViewShell) !=  nullptr )
+        pCursorShell = static_cast<SwCursorShell*>( pViewShell );
     else
-        pCrsrShell = nullptr;
+        pCursorShell = nullptr;
 
-    return pCrsrShell;
+    return pCursorShell;
 }
 
-const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
+const SwCursorShell* SwAccessibleContext::GetCursorShell() const
 {
-    // just like non-const GetCrsrShell
-    const SwCrsrShell* pCrsrShell;
+    // just like non-const GetCursorShell
+    const SwCursorShell* pCursorShell;
     const SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : nullptr;
     OSL_ENSURE( pViewShell, "no view shell" );
-    if( pViewShell && dynamic_cast<const SwCrsrShell*>( pViewShell) !=  nullptr )
-        pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell );
+    if( pViewShell && dynamic_cast<const SwCursorShell*>( pViewShell) !=  nullptr )
+        pCursorShell = static_cast<const SwCursorShell*>( pViewShell );
     else
-        pCrsrShell = nullptr;
+        pCursorShell = nullptr;
 
-    return pCrsrShell;
+    return pCursorShell;
 }
 
 enum class Action { NONE, SCROLLED, SCROLLED_WITHIN,
                           SCROLLED_IN, SCROLLED_OUT };
 
-void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
+void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame,
                                             const SwRect& rOldVisArea )
 {
     const SwRect& rNewVisArea = GetVisArea();
-    const bool bVisibleChildrenOnly = SwAccessibleChild( pFrm ).IsVisibleChildrenOnly();
+    const bool bVisibleChildrenOnly = SwAccessibleChild( pFrame ).IsVisibleChildrenOnly();
 
-    const SwAccessibleChildSList aList( *pFrm, *(GetMap()) );
+    const SwAccessibleChildSList aList( *pFrame, *(GetMap()) );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     while( aIter != aList.end() )
     {
@@ -182,11 +182,11 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
             }
             if( Action::NONE != eAction )
             {
-                if ( rLower.GetSwFrm() )
+                if ( rLower.GetSwFrame() )
                 {
                     OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
                             "<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
-                    const SwFrm* pLower( rLower.GetSwFrm() );
+                    const SwFrame* pLower( rLower.GetSwFrame() );
                     ::rtl::Reference< SwAccessibleContext > xAccImpl =
                         GetMap()->GetContextImpl( pLower );
                     if( xAccImpl.is() )
@@ -256,13 +256,13 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
                 }
             }
         }
-        else if ( rLower.GetSwFrm() &&
+        else if ( rLower.GetSwFrame() &&
                   ( !bVisibleChildrenOnly ||
                     aBox.IsOver( rOldVisArea ) ||
                     aBox.IsOver( rNewVisArea ) ) )
         {
             // There are no unaccessible SdrObjects that need to be notified
-            ChildrenScrolled( rLower.GetSwFrm(), rOldVisArea );
+            ChildrenScrolled( rLower.GetSwFrame(), rOldVisArea );
         }
         ++aIter;
     }
@@ -272,7 +272,7 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
 {
     SetVisArea( GetMap()->GetVisArea() );
 
-    ChildrenScrolled( GetFrm(), rOldVisArea );
+    ChildrenScrolled( GetFrame(), rOldVisArea );
 
     bool bIsOldShowingState;
     bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -291,7 +291,7 @@ void SwAccessibleContext::ScrolledWithin( const SwRect& rOldVisArea )
 {
     SetVisArea( GetMap()->GetVisArea() );
 
-    ChildrenScrolled( GetFrm(), rOldVisArea );
+    ChildrenScrolled( GetFrame(), rOldVisArea );
 
     FireVisibleDataEvent();
 }
@@ -305,7 +305,7 @@ void SwAccessibleContext::ScrolledIn()
             "Vis area of child is wrong. Did it exist already?" );
 
     // Send child event at parent. That's all we have to do here.
-    const SwFrm* pParent = GetParent();
+    const SwFrame* pParent = GetParent();
     ::rtl::Reference< SwAccessibleContext > xParentImpl(
          GetMap()->GetContextImpl( pParent, false ) );
     uno::Reference < XAccessibleContext > xThis( this );
@@ -341,7 +341,7 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
     // because this call will only dispose children that are in the
     // new vis area. The children we want to dispose however are in the
     // old vis area all.
-    ChildrenScrolled( GetFrm(), rOldVisArea );
+    ChildrenScrolled( GetFrame(), rOldVisArea );
 
     // Broadcast a state changed event for the showing state.
     // It might be that the child is freshly created just to send
@@ -350,16 +350,16 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
 }
 
 // #i27301# - use new type definition for <_nStates>
-void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
+void SwAccessibleContext::InvalidateChildrenStates( const SwFrame* _pFrame,
                                                     AccessibleStates _nStates )
 {
-    const SwAccessibleChildSList aVisList( GetVisArea(), *_pFrm, *(GetMap()) );
+    const SwAccessibleChildSList aVisList( GetVisArea(), *_pFrame, *(GetMap()) );
 
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
     while( aIter != aVisList.end() )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm* pLower = rLower.GetSwFrm();
+        const SwFrame* pLower = rLower.GetSwFrame();
         if( pLower )
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl;
@@ -383,15 +383,15 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
     }
 }
 
-void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
+void SwAccessibleContext::DisposeChildren( const SwFrame *pFrame,
                                            bool bRecursive )
 {
-    const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *(GetMap()) );
+    const SwAccessibleChildSList aVisList( GetVisArea(), *pFrame, *(GetMap()) );
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
     while( aIter != aVisList.end() )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm* pLower = rLower.GetSwFrm();
+        const SwFrame* pLower = rLower.GetSwFrame();
         if( pLower )
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl;
@@ -432,8 +432,8 @@ void SwAccessibleContext::_InvalidateFocus()
 
 void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
 {
-    OSL_ENSURE( GetFrm(), "fire event for disposed frame?" );
-    if( !GetFrm() )
+    OSL_ENSURE( GetFrame(), "fire event for disposed frame?" );
+    if( !GetFrame() )
         return;
 
     if( !rEvent.Source.is() )
@@ -512,7 +512,7 @@ bool SwAccessibleContext::IsEditableState()
 
 SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *const pMap,
                                           sal_Int16 const nRole,
-                                          const SwFrm *pF )
+                                          const SwFrame *pF )
     : SwAccessibleFrame( pMap->GetVisArea().SVRect(), pF,
                          pMap->GetShell()->IsPreview() )
     , m_pMap( pMap )
@@ -528,7 +528,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *const pMap,
 SwAccessibleContext::~SwAccessibleContext()
 {
     SolarMutexGuard aGuard;
-    RemoveFrmFromAccessibleMap();
+    RemoveFrameFromAccessibleMap();
 }
 
 uno::Reference< XAccessibleContext > SAL_CALL
@@ -575,10 +575,10 @@ uno::Reference< XAccessible> SAL_CALL
     }
 
     uno::Reference< XAccessible > xChild;
-    if( aChild.GetSwFrm() )
+    if( aChild.GetSwFrame() )
     {
         ::rtl::Reference < SwAccessibleContext > xChildImpl(
-                GetMap()->GetContextImpl( aChild.GetSwFrm(), !m_isDisposing )  );
+                GetMap()->GetContextImpl( aChild.GetSwFrame(), !m_isDisposing )  );
         if( xChildImpl.is() )
         {
             xChildImpl->SetParent( this );
@@ -608,7 +608,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent()
 
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
-    const SwFrm *pUpper = GetParent();
+    const SwFrame *pUpper = GetParent();
     OSL_ENSURE( pUpper != nullptr || m_isDisposing, "no upper found" );
 
     uno::Reference< XAccessible > xAcc;
@@ -633,7 +633,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
 
     CHECK_FOR_DEFUNC( XAccessibleContext )
 
-    const SwFrm *pUpper = GetParent();
+    const SwFrame *pUpper = GetParent();
     OSL_ENSURE( pUpper != nullptr || m_isDisposing, "no upper found" );
 
     sal_Int32 nIndex = -1;
@@ -643,7 +643,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
             GetMap()->GetContextImpl(pUpper, !m_isDisposing) );
         OSL_ENSURE( xAccImpl.is() || m_isDisposing, "no parent found" );
         if( xAccImpl.is() )
-            nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
+            nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrame()) );
     }
 
     return nIndex;
@@ -776,18 +776,18 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
     CHECK_FOR_WINDOW( XAccessibleComponent, pWin )
 
     Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to parent
-    if( !GetFrm()->IsRootFrm() )
+    if( !GetFrame()->IsRootFrame() )
     {
-        SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root
+        SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
         Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() );
         aPixPoint.setX(aPixPoint.getX() + aPixPos.getX());
         aPixPoint.setY(aPixPoint.getY() + aPixPos.getY());
     }
 
     const SwAccessibleChild aChild( GetChildAtPixel( aPixPoint, *(GetMap()) ) );
-    if( aChild.GetSwFrm() )
+    if( aChild.GetSwFrame() )
     {
-        xAcc = GetMap()->GetContext( aChild.GetSwFrm() );
+        xAcc = GetMap()->GetContext( aChild.GetSwFrame() );
     }
     else if( aChild.GetDrawObject() )
     {
@@ -826,30 +826,30 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
 
     CHECK_FOR_DEFUNC( XAccessibleComponent )
 
-    const SwFrm *pParent = GetParent();
+    const SwFrame *pParent = GetParent();
     OSL_ENSURE( pParent, "no Parent found" );
     vcl::Window *pWin = GetWindow();
 
     CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent )
 
-    SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root
+    SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
     Rectangle aPixBounds( 0, 0, 0, 0 );
-    if( GetFrm()->IsPageFrm() &&
-        static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() )
+    if( GetFrame()->IsPageFrame() &&
+        static_cast < const SwPageFrame * >( GetFrame() )->IsEmptyPage() )
     {
         OSL_ENSURE( GetShell()->IsPreview(), "empty page accessible?" );
         if( GetShell()->IsPreview() )
         {
             // adjust method call <GetMap()->GetPreviewPageSize()>
             sal_uInt16 nPageNum =
-                static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum();
+                static_cast < const SwPageFrame * >( GetFrame() )->GetPhyPageNum();
             aLogBounds.SSize( GetMap()->GetPreviewPageSize( nPageNum ) );
         }
     }
     if( !aLogBounds.IsEmpty() )
     {
         aPixBounds = GetMap()->CoreToPixel( aLogBounds.SVRect() );
-        if( !pParent->IsRootFrm() && bRelative)
+        if( !pParent->IsRootFrame() && bRelative)
         {
             SwRect aParentLogBounds( GetBounds( *(GetMap()), pParent ) ); // twip rel to doc root
             Point aParentPixPos( GetMap()->CoreToPixel( aParentLogBounds.SVRect() ).TopLeft() );
@@ -910,30 +910,30 @@ void SAL_CALL SwAccessibleContext::grabFocus()
 
     CHECK_FOR_DEFUNC( XAccessibleContext );
 
-    if( GetFrm()->IsFlyFrm() )
+    if( GetFrame()->IsFlyFrame() )
     {
         const SdrObject *pObj =
-            static_cast < const SwFlyFrm * >( GetFrm() )->GetVirtDrawObj();
+            static_cast < const SwFlyFrame * >( GetFrame() )->GetVirtDrawObj();
         if( pObj )
             Select( const_cast < SdrObject * >( pObj ), false );
     }
     else
     {
-        const SwContentFrm *pCFrm = nullptr;
-        if( GetFrm()->IsContentFrm() )
-            pCFrm = static_cast< const SwContentFrm * >( GetFrm() );
-        else if( GetFrm()->IsLayoutFrm() )
-            pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent();
+        const SwContentFrame *pCFrame = nullptr;
+        if( GetFrame()->IsContentFrame() )
+            pCFrame = static_cast< const SwContentFrame * >( GetFrame() );
+        else if( GetFrame()->IsLayoutFrame() )
+            pCFrame = static_cast< const SwLayoutFrame * >( GetFrame() )->ContainsContent();
 
-        if( pCFrm && pCFrm->IsTextFrm() )
+        if( pCFrame && pCFrame->IsTextFrame() )
         {
-            const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm );
-            const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+            const SwTextFrame *pTextFrame = static_cast< const SwTextFrame * >( pCFrame );
+            const SwTextNode *pTextNd = pTextFrame->GetTextNode();
             if( pTextNd )
             {
                 // create pam for selection
                 SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
-                                pTextFrm->GetOfst() );
+                                pTextFrame->GetOfst() );
                 SwPosition aStartPos( *pTextNd, aIndex );
                 SwPaM aPaM( aStartPos );
 
@@ -1026,7 +1026,7 @@ void SwAccessibleContext::Dispose( bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
-    OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+    OSL_ENSURE( GetFrame() && GetMap(), "already disposed" );
     OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
                 "invalid vis area for dispose" );
 
@@ -1034,7 +1034,7 @@ void SwAccessibleContext::Dispose( bool bRecursive )
 
     // dispose children
     if( bRecursive )
-        DisposeChildren( GetFrm(), bRecursive );
+        DisposeChildren( GetFrame(), bRecursive );
 
     // get parent
     uno::Reference< XAccessible > xParent( GetWeakParent() );
@@ -1065,58 +1065,58 @@ void SwAccessibleContext::Dispose( bool bRecursive )
         m_nClientId =  0;
     }
 
-    RemoveFrmFromAccessibleMap();
-    ClearFrm();
+    RemoveFrameFromAccessibleMap();
+    ClearFrame();
     m_pMap = nullptr;
 
     m_isDisposing = false;
 }
 
-void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
+void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrameOrObj,
                                         bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
-    if ( IsShowing( *(GetMap()), rChildFrmOrObj ) ||
-         rChildFrmOrObj.AlwaysIncludeAsChild() ||
-         !SwAccessibleChild( GetFrm() ).IsVisibleChildrenOnly() )
+    if ( IsShowing( *(GetMap()), rChildFrameOrObj ) ||
+         rChildFrameOrObj.AlwaysIncludeAsChild() ||
+         !SwAccessibleChild( GetFrame() ).IsVisibleChildrenOnly() )
     {
         // If the object could have existed before, than there is nothing to do,
         // because no wrapper exists now and therefore no one is interested to
         // get notified of the movement.
-        if( rChildFrmOrObj.GetSwFrm() )
+        if( rChildFrameOrObj.GetSwFrame() )
         {
             ::rtl::Reference< SwAccessibleContext > xAccImpl =
-                    GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+                    GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
             xAccImpl->Dispose( bRecursive );
         }
-        else if ( rChildFrmOrObj.GetDrawObject() )
+        else if ( rChildFrameOrObj.GetDrawObject() )
         {
             ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
-                    GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+                    GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
                                               this );
-            DisposeShape( rChildFrmOrObj.GetDrawObject(),
+            DisposeShape( rChildFrameOrObj.GetDrawObject(),
                           xAccImpl.get() );
         }
-        else if ( rChildFrmOrObj.GetWindow() )
+        else if ( rChildFrameOrObj.GetWindow() )
         {
             AccessibleEventObject aEvent;
             aEvent.EventId = AccessibleEventId::CHILD;
             uno::Reference< XAccessible > xAcc =
-                                    rChildFrmOrObj.GetWindow()->GetAccessible();
+                                    rChildFrameOrObj.GetWindow()->GetAccessible();
             aEvent.OldValue <<= xAcc;
             FireAccessibleEvent( aEvent );
         }
     }
-    else if( bRecursive && rChildFrmOrObj.GetSwFrm() )
-        DisposeChildren( rChildFrmOrObj.GetSwFrm(), bRecursive );
+    else if( bRecursive && rChildFrameOrObj.GetSwFrame() )
+        DisposeChildren( rChildFrameOrObj.GetSwFrame(), bRecursive );
 }
 
 void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
 {
     SolarMutexGuard aGuard;
 
-    OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
+    OSL_ENSURE( GetFrame() && !GetFrame()->Frame().IsEmpty(), "context should have a size" );
 
     bool bIsOldShowingState;
     bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -1144,47 +1144,47 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
 }
 
 void SwAccessibleContext::InvalidateChildPosOrSize(
-                    const SwAccessibleChild& rChildFrmOrObj,
-                    const SwRect& rOldFrm )
+                    const SwAccessibleChild& rChildFrameOrObj,
+                    const SwRect& rOldFrame )
 {
     SolarMutexGuard aGuard;
 
-    OSL_ENSURE( !rChildFrmOrObj.GetSwFrm() ||
-            !rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(),
+    OSL_ENSURE( !rChildFrameOrObj.GetSwFrame() ||
+            !rChildFrameOrObj.GetSwFrame()->Frame().IsEmpty(),
             "child context should have a size" );
 
-    if ( rChildFrmOrObj.AlwaysIncludeAsChild() )
+    if ( rChildFrameOrObj.AlwaysIncludeAsChild() )
     {
         // nothing to do;
         return;
     }
 
-    const bool bVisibleChildrenOnly = SwAccessibleChild( GetFrm() ).IsVisibleChildrenOnly();
-    const bool bNew = rOldFrm.IsEmpty() ||
-                     ( rOldFrm.Left() == 0 && rOldFrm.Top() == 0 );
-    if( IsShowing( *(GetMap()), rChildFrmOrObj ) )
+    const bool bVisibleChildrenOnly = SwAccessibleChild( GetFrame() ).IsVisibleChildrenOnly();
+    const bool bNew = rOldFrame.IsEmpty() ||
+                     ( rOldFrame.Left() == 0 && rOldFrame.Top() == 0 );
+    if( IsShowing( *(GetMap()), rChildFrameOrObj ) )
     {
         // If the object could have existed before, than there is nothing to do,
         // because no wrapper exists now and therefore no one is interested to
         // get notified of the movement.
-        if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrm )) )
+        if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrame )) )
         {
-            if( rChildFrmOrObj.GetSwFrm() )
+            if( rChildFrameOrObj.GetSwFrame() )
             {
                 // The frame becomes visible. A child event must be send.
                 ::rtl::Reference< SwAccessibleContext > xAccImpl =
-                    GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+                    GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
                 xAccImpl->ScrolledIn();
             }
-            else if ( rChildFrmOrObj.GetDrawObject() )
+            else if ( rChildFrameOrObj.GetDrawObject() )
             {
                 ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
-                        GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+                        GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
                                                   this );
                 // #i37790#
                 if ( xAccImpl.is() )
                 {
-                    ScrolledInShape( rChildFrmOrObj.GetDrawObject(),
+                    ScrolledInShape( rChildFrameOrObj.GetDrawObject(),
                                      xAccImpl.get() );
                 }
                 else
@@ -1192,11 +1192,11 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
                     OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
                 }
             }
-            else if ( rChildFrmOrObj.GetWindow() )
+            else if ( rChildFrameOrObj.GetWindow() )
             {
                 AccessibleEventObject aEvent;
                 aEvent.EventId = AccessibleEventId::CHILD;
-                aEvent.NewValue <<= (rChildFrmOrObj.GetWindow()->GetAccessible());
+                aEvent.NewValue <<= (rChildFrameOrObj.GetWindow()->GetAccessible());
                 FireAccessibleEvent( aEvent );
             }
         }
@@ -1208,24 +1208,24 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
         // no notifications for grandchildren are required. If the are
         // grandgrandchildren, they would be notified by the layout.
         if( bVisibleChildrenOnly &&
-            !bNew && IsShowing( rOldFrm ) )
+            !bNew && IsShowing( rOldFrame ) )
         {
-            if( rChildFrmOrObj.GetSwFrm() )
+            if( rChildFrameOrObj.GetSwFrame() )
             {
                 ::rtl::Reference< SwAccessibleContext > xAccImpl =
-                    GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+                    GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
                 xAccImpl->SetParent( this );
                 xAccImpl->Dispose( true );
             }
-            else if ( rChildFrmOrObj.GetDrawObject() )
+            else if ( rChildFrameOrObj.GetDrawObject() )
             {
                 ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
-                        GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+                        GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
                                                   this );
-                DisposeShape( rChildFrmOrObj.GetDrawObject(),
+                DisposeShape( rChildFrameOrObj.GetDrawObject(),
                           xAccImpl.get() );
             }
-            else if ( rChildFrmOrObj.GetWindow() )
+            else if ( rChildFrameOrObj.GetWindow() )
             {
                 OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <vcl::Window>." );
             }
@@ -1292,7 +1292,7 @@ void SwAccessibleContext::InvalidateStates( AccessibleStates _nStates )
             }
         }
 
-        InvalidateChildrenStates( GetFrm(), _nStates );
+        InvalidateChildrenStates( GetFrame(), _nStates );
     }
 }
 
@@ -1330,19 +1330,19 @@ bool SwAccessibleContext::HasCursor()
 bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
                                   bool bAdd )
 {
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( !pCrsrShell )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( !pCursorShell )
         return false;
 
-    SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCrsrShell) !=  nullptr
-                                ? static_cast<SwFEShell*>( pCrsrShell )
+    SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCursorShell) !=  nullptr
+                                ? static_cast<SwFEShell*>( pCursorShell )
                                 : nullptr;
     // Get rid of activated OLE object
     if( pFEShell )
         pFEShell->FinishOLEObj();
 
-    SwWrtShell* pWrtShell = dynamic_cast<const SwWrtShell*>( pCrsrShell) !=  nullptr
-                                ? static_cast<SwWrtShell*>( pCrsrShell )
+    SwWrtShell* pWrtShell = dynamic_cast<const SwWrtShell*>( pCursorShell) !=  nullptr
+                                ? static_cast<SwWrtShell*>( pCursorShell )
                                 : nullptr;
 
     bool bRet = false;
@@ -1360,28 +1360,28 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
     {
         // Get rid of frame selection. If there is one, make text cursor
         // visible again.
-        bool bCallShowCrsr = false;
-        if( pFEShell && (pFEShell->IsFrmSelected() ||
+        bool bCallShowCursor = false;
+        if( pFEShell && (pFEShell->IsFrameSelected() ||
                          pFEShell->IsObjSelected()) )
         {
             Point aPt( LONG_MIN, LONG_MIN );
             pFEShell->SelectObj( aPt );
-            bCallShowCrsr = true;
+            bCallShowCursor = true;
         }
-        pCrsrShell->KillPams();
+        pCursorShell->KillPams();
         if( pWrtShell && pPaM->HasMark() )
             // We have to do this or SwWrtShell can't figure out that it needs
             // to kill the selection later, when the user moves the cursor.
             pWrtShell->SttSelect();
-        pCrsrShell->SetSelection( *pPaM );
+        pCursorShell->SetSelection( *pPaM );
         if( pPaM->HasMark() && *pPaM->GetPoint() == *pPaM->GetMark())
             // Setting a "Selection" that starts and ends at the same spot
             // should remove the selection rather than create an empty one, so
             // that we get defined behavior if accessibility sets the cursor
             // later.
-            pCrsrShell->ClearMark();
-        if( bCallShowCrsr )
-            pCrsrShell->ShowCrsr();
+            pCursorShell->ClearMark();
+        if( bCallShowCursor )
+            pCursorShell->ShowCursor();
         bRet = true;
     }
 
@@ -1411,22 +1411,22 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
     return sStr;
 }
 
-void SwAccessibleContext::RemoveFrmFromAccessibleMap()
+void SwAccessibleContext::RemoveFrameFromAccessibleMap()
 {
-    if (m_isRegisteredAtAccessibleMap && GetFrm() && GetMap())
-        GetMap()->RemoveContext( GetFrm() );
+    if (m_isRegisteredAtAccessibleMap && GetFrame() && GetMap())
+        GetMap()->RemoveContext( GetFrame() );
 }
 
 bool SwAccessibleContext::HasAdditionalAccessibleChildren()
 {
     bool bRet( false );
 
-    if ( GetFrm()->IsTextFrm() )
+    if ( GetFrame()->IsTextFrame() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
         {
-            bRet = pPostItMgr->HasFrmConnectedSidebarWins( *(GetFrm()) );
+            bRet = pPostItMgr->HasFrameConnectedSidebarWins( *(GetFrame()) );
         }
     }
 
@@ -1438,13 +1438,13 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 {
     vcl::Window* pAdditionalAccessibleChild( nullptr );
 
-    if ( GetFrm()->IsTextFrm() )
+    if ( GetFrame()->IsTextFrame() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
         {
             pAdditionalAccessibleChild =
-                    pPostItMgr->GetSidebarWinForFrmByIndex( *(GetFrm()), nIndex );
+                    pPostItMgr->GetSidebarWinForFrameByIndex( *(GetFrame()), nIndex );
         }
     }
 
@@ -1454,12 +1454,12 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
 /** #i88070# - get all additional accessible children */
 void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren )
 {
-    if ( GetFrm()->IsTextFrm() )
+    if ( GetFrame()->IsTextFrame() )
     {
         SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
         if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
         {
-            pPostItMgr->GetAllSidebarWinForFrm( *(GetFrm()), pChildren );
+            pPostItMgr->GetAllSidebarWinForFrame( *(GetFrame()), pChildren );
         }
     }
 }
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index e52daa569fed..e703bf4e6c29 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -31,7 +31,7 @@
 
 namespace vcl { class Window; }
 class SwAccessibleMap;
-class SwCrsrShell;
+class SwCursorShell;
 class SdrObject;
 class SwPaM;
 namespace utl {
@@ -55,7 +55,7 @@ class SwAccessibleContext :
 {
     // The implements for the XAccessibleSelection interface has been
     // 'externalized' and wants access to the protected members like
-    // GetMap, GetChild, GetParent, and GetFrm.
+    // GetMap, GetChild, GetParent, and GetFrame.
     friend class SwAccessibleSelectionHelper;
 
 protected:
@@ -117,15 +117,15 @@ protected:
         return GetMap()->GetShell();
     }
 
-    /** convenience method to get SwCrsrShell through accessibility map
-     * @returns SwCrsrShell, or NULL if none is found */
-    SwCrsrShell* GetCrsrShell();
-    const SwCrsrShell* GetCrsrShell() const;
+    /** convenience method to get SwCursorShell through accessibility map
+     * @returns SwCursorShell, or NULL if none is found */
+    SwCursorShell* GetCursorShell();
+    const SwCursorShell* GetCursorShell() const;
 
     // Notify all children that the vis area has changed.
-    // The SwFrm might belong to the current object or to any other child or
+    // The SwFrame might belong to the current object or to any other child or
     // grandchild.
-    void ChildrenScrolled( const SwFrm *pFrm, const SwRect& rOldVisArea );
+    void ChildrenScrolled( const SwFrame *pFrame, const SwRect& rOldVisArea );
 
     // The context's showing state changed. May only be called for context that
     // exist even if they aren't visible.
@@ -140,15 +140,15 @@ protected:
     // The context has to be removed while setting the vis area
     void ScrolledOut( const SwRect& rOldVisArea );
 
-    // Invalidate the states of all children of the specified SwFrm. The
-    // SwFrm might belong the current object or to any child or grandchild!
+    // Invalidate the states of all children of the specified SwFrame. The
+    // SwFrame might belong the current object or to any child or grandchild!
     // #i27301# - use new type definition for <_nStates>
-    void InvalidateChildrenStates( const SwFrm* _pFrm,
+    void InvalidateChildrenStates( const SwFrame* _pFrame,
                                    AccessibleStates _nStates );
 
-    // Dispose children of the specified SwFrm. The SwFrm might belong to
+    // Dispose children of the specified SwFrame. The SwFrame might belong to
     // the current object or to any other child or grandchild.
-    void DisposeChildren( const SwFrm *pFrm,
+    void DisposeChildren( const SwFrame *pFrame,
                           bool bRecursive );
 
     void DisposeShape( const SdrObject *pObj,
@@ -188,13 +188,13 @@ protected:
     {
         m_isRegisteredAtAccessibleMap = false;
     }
-    void RemoveFrmFromAccessibleMap();
+    void RemoveFrameFromAccessibleMap();
 
     virtual ~SwAccessibleContext();
 
 public:
     SwAccessibleContext( SwAccessibleMap *m_pMap, sal_Int16 nRole,
-                         const SwFrm *pFrm );
+                         const SwFrame *pFrame );
 
     // XAccessible
 
@@ -319,14 +319,14 @@ public:
     virtual void Dispose( bool bRecursive = false );
 
     // The child object is not visible an longer and should be destroyed
-    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, bool bRecursive );
+    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrameOrObj, bool bRecursive );
 
     // The object has been moved by the layout
-    virtual void InvalidatePosOrSize( const SwRect& rFrm );
+    virtual void InvalidatePosOrSize( const SwRect& rFrame );
 
     // The child object has been moved by the layout
-    virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj,
-                                           const SwRect& rFrm );
+    virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrameOrObj,
+                                           const SwRect& rFrame );
 
     // The content may have changed (but it hasn't to have changed)
     void InvalidateContent();
@@ -386,7 +386,7 @@ public:
     throw aExcept;
 
 #define CHECK_FOR_DEFUNC_THIS( ifc, ths )                \
-    if( !(GetFrm() && GetMap()) )                        \
+    if( !(GetFrame() && GetMap()) )                        \
     {                                                    \
         css::uno::Reference < ifc > xThis( ths );        \
         css::lang::DisposedException aExcept(            \
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 08271f25bf16..2cb759a11876 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -93,7 +93,7 @@ void SwAccessibleDocumentBase::SetVisArea()
         SwAccessibleFrame::SetVisArea( GetMap()->GetVisArea() );
         // #i58139# - showing state of document view needs also be updated.
         // Thus, call method <Scrolled(..)> instead of <ChildrenScrolled(..)>
-        // ChildrenScrolled( GetFrm(), aOldVisArea );
+        // ChildrenScrolled( GetFrame(), aOldVisArea );
         Scrolled( aOldVisArea );
     }
 }
@@ -382,7 +382,7 @@ SwAccessibleDocument::~SwAccessibleDocument()
 
 void SwAccessibleDocument::Dispose( bool bRecursive )
 {
-    OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+    OSL_ENSURE( GetFrame() && GetMap(), "already disposed" );
 
     vcl::Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : nullptr;
     if( pWin )
@@ -559,12 +559,12 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
     if (!pDoc)
         return anyAtrribute;
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( !pCrsrShell )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( !pCursorShell )
         return anyAtrribute;
 
-    SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCrsrShell) !=  nullptr
-                                ? static_cast<SwFEShell*>( pCrsrShell )
+    SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCursorShell) !=  nullptr
+                                ? static_cast<SwFEShell*>( pCursorShell )
                             : nullptr;
     OUString sAttrName;
     OUString sValue;
@@ -582,95 +582,95 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
         sValue += OUString::number( nPage ) ;
         sAttrName = ";total-pages:";
         sValue += sAttrName;
-        sValue += OUString::number( pCrsrShell->GetPageCnt() ) ;
+        sValue += OUString::number( pCursorShell->GetPageCnt() ) ;
         sValue += ";";
 
         sAttrName = "line-number:";
 
-        SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
-        SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm();
+        SwContentFrame* pCurrFrame = pCursorShell->GetCurrFrame();
+        SwPageFrame* pCurrPage=static_cast<SwFrame*>(pCurrFrame)->FindPageFrame();
         sal_uLong nLineNum = 0;
-        SwTextFrm* pTextFrm = nullptr;
-        SwTextFrm* pCurrTextFrm = nullptr;
-        pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent());
-        if (pCurrFrm->IsInFly())//such as, graphic,chart
+        SwTextFrame* pTextFrame = nullptr;
+        SwTextFrame* pCurrTextFrame = nullptr;
+        pTextFrame = static_cast< SwTextFrame* >(static_cast< SwPageFrame* > (pCurrPage)->ContainsContent());
+        if (pCurrFrame->IsInFly())//such as, graphic,chart
         {
-            SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm();
-            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+            SwFlyFrame *pFlyFrame = pCurrFrame->FindFlyFrame();
+            const SwFormatAnchor& rAnchor = pFlyFrame->GetFormat()->GetAnchor();
             RndStdIds eAnchorId = rAnchor.GetAnchorId();
             if(eAnchorId == FLY_AS_CHAR)
             {
-                const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm();
-                if(pSwFrm->IsTextFrm())
-                    pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm));
+                const SwFrame *pSwFrame = pFlyFrame->GetAnchorFrame();
+                if(pSwFrame->IsTextFrame())
+                    pCurrTextFrame = const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pSwFrame));
             }
         }
         else
-            pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm));
+            pCurrTextFrame = const_cast<SwTextFrame*>(static_cast<const SwTextFrame* >(pCurrFrame));
         //check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer
-        SwFrm* pFrm = pCurrTextFrm;
-        while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
-            pFrm = pFrm->GetUpper();
-        if ( pFrm )
-            pCurrTextFrm = nullptr;
+        SwFrame* pFrame = pCurrTextFrame;
+        while ( pFrame && !pFrame->IsHeaderFrame() && !pFrame->IsFooterFrame() )
+            pFrame = pFrame->GetUpper();
+        if ( pFrame )
+            pCurrTextFrame = nullptr;
         //check shape
-        if(pCrsrShell->Imp()->GetDrawView())
+        if(pCursorShell->Imp()->GetDrawView())
         {
-            const SdrMarkList &rMrkList = pCrsrShell->Imp()->GetDrawView()->GetMarkedObjectList();
+            const SdrMarkList &rMrkList = pCursorShell->Imp()->GetDrawView()->GetMarkedObjectList();
             for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
             {
                 SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj();
                 SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
                 const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
                 if( FLY_AS_CHAR != rAnchor.GetAnchorId() )
-                    pCurrTextFrm = nullptr;
+                    pCurrTextFrame = nullptr;
             }
         }
         //calculate line number
-        if (pCurrTextFrm && pTextFrm)
+        if (pCurrTextFrame && pTextFrame)
         {
-            if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote()))
+            if (!(pCurrTextFrame->IsInTab() || pCurrTextFrame->IsInFootnote()))
             {
-                while( pTextFrm != pCurrTextFrm )
+                while( pTextFrame != pCurrTextFrame )
                 {
                     //check header/footer
-                    pFrm = pTextFrm;
-                    while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
-                        pFrm = pFrm->GetUpper();
-                    if ( pFrm )
+                    pFrame = pTextFrame;
+                    while ( pFrame && !pFrame->IsHeaderFrame() && !pFrame->IsFooterFrame() )
+                        pFrame = pFrame->GetUpper();
+                    if ( pFrame )
                     {
-                        pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm());
+                        pTextFrame = static_cast< SwTextFrame*>(pTextFrame->GetNextContentFrame());
                         continue;
                     }
-                    if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly()))
-                        nLineNum += pTextFrm->GetThisLines();
-                    pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm());
+                    if (!(pTextFrame->IsInTab() || pTextFrame->IsInFootnote() || pTextFrame->IsInFly()))
+                        nLineNum += pTextFrame->GetThisLines();
+                    pTextFrame = static_cast< SwTextFrame* >(pTextFrame ->GetNextContentFrame());
                 }
-                SwPaM* pCaret = pCrsrShell->GetCrsr();
-                if (!pCurrTextFrm->IsEmpty() && pCaret)
+                SwPaM* pCaret = pCursorShell->GetCursor();
+                if (!pCurrTextFrame->IsEmpty() && pCaret)
                 {
-                    if (pCurrTextFrm->IsTextFrm())
+                    if (pCurrTextFrame->IsTextFrame())
                     {
                         const SwPosition* pPoint = nullptr;
-                        if(pCurrTextFrm->IsInFly())
+                        if(pCurrTextFrame->IsInFly())
                         {
-                            SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm();
-                            const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+                            SwFlyFrame *pFlyFrame = pCurrTextFrame->FindFlyFrame();
+                            const SwFormatAnchor& rAnchor = pFlyFrame->GetFormat()->GetAnchor();
                             pPoint= rAnchor.GetContentAnchor();
                         }
                         else
                             pPoint = pCaret->GetPoint();
                         const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                        nLineNum += pCurrTextFrm->GetLineCount( nActPos );
+                        nLineNum += pCurrTextFrame->GetLineCount( nActPos );
                     }
                     else//graphic, form, shape, etc.
                     {
                         SwPosition* pPoint =  pCaret->GetPoint();
-                        Point aPt = pCrsrShell->_GetCrsr()->GetPtPos();
-                        if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) )
+                        Point aPt = pCursorShell->_GetCursor()->GetPtPos();
+                        if( pCursorShell->GetLayout()->GetCursorOfst( pPoint, aPt/*,* &eTmpState*/ ) )
                         {
                             const sal_Int32 nActPos = pPoint->nContent.GetIndex();
-                            nLineNum += pCurrTextFrm->GetLineCount( nActPos );
+                            nLineNum += pCurrTextFrame->GetLineCount( nActPos );
                         }
                     }
                 }
@@ -684,7 +684,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sValue += ";";
 
-        SwFrm* pCurrCol=static_cast<SwFrm*>(pCurrFrm)->FindColFrm();
+        SwFrame* pCurrCol=static_cast<SwFrame*>(pCurrFrame)->FindColFrame();
 
         sAttrName = "column-number:";
         sValue += sAttrName;
@@ -692,18 +692,18 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
         int nCurrCol = 1;
         if(pCurrCol!=nullptr)
         {
-            //SwLayoutFrm* pParent = pCurrCol->GetUpper();
-            SwFrm* pCurrPageCol=static_cast<SwFrm*>(pCurrFrm)->FindColFrm();
-            while(pCurrPageCol && pCurrPageCol->GetUpper() && pCurrPageCol->GetUpper()->IsPageFrm())
+            //SwLayoutFrame* pParent = pCurrCol->GetUpper();
+            SwFrame* pCurrPageCol=static_cast<SwFrame*>(pCurrFrame)->FindColFrame();
+            while(pCurrPageCol && pCurrPageCol->GetUpper() && pCurrPageCol->GetUpper()->IsPageFrame())
             {
                 pCurrPageCol = pCurrPageCol->GetUpper();
             }
 
-            SwLayoutFrm* pParent = pCurrPageCol->GetUpper();
+            SwLayoutFrame* pParent = pCurrPageCol->GetUpper();
 
             if(pParent!=nullptr)
             {
-                SwFrm* pCol = pParent->Lower();
+                SwFrame* pCol = pParent->Lower();
                 while(pCol&&(pCol!=pCurrPageCol))
                 {
                     pCol = pCol->GetNext();
@@ -724,13 +724,13 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
         sValue += ";";
 
-        SwSectionFrm* pCurrSctFrm=static_cast<SwFrm*>(pCurrFrm)->FindSctFrm();
-        if(pCurrSctFrm!=nullptr && pCurrSctFrm->GetSection()!=nullptr )
+        SwSectionFrame* pCurrSctFrame=static_cast<SwFrame*>(pCurrFrame)->FindSctFrame();
+        if(pCurrSctFrame!=nullptr && pCurrSctFrame->GetSection()!=nullptr )
         {
             sAttrName = "section-name:";
 
             sValue += sAttrName;
-            OUString sectionName = pCurrSctFrm->GetSection()->GetSectionName();
+            OUString sectionName = pCurrSctFrame->GetSection()->GetSectionName();
 
             sectionName = sectionName.replaceFirst( "\\" , "\\\\" );
             sectionName = sectionName.replaceFirst( "=" , "\\=" );
@@ -749,10 +749,10 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
             if(pCurrCol!=nullptr)
             {
-                SwLayoutFrm* pParent = pCurrCol->GetUpper();
+                SwLayoutFrame* pParent = pCurrCol->GetUpper();
                 if(pParent!=nullptr)
                 {
-                    SwFrm* pCol = pParent->Lower();
+                    SwFrame* pCol = pParent->Lower();
                     while(pCol&&(pCol!=pCurrCol))
                     {
                         pCol = pCol->GetNext();
@@ -766,7 +766,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
 
             //section-total-columns
             sAttrName = "section-total-columns:";
-            const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+            const SwFormatCol &rFormatSctCol=pCurrSctFrame->GetAttrSet()->GetCol();
             sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols();
             nSctColCount = nSctColCount>0?nSctColCount:1;
             sValue += sAttrName;
@@ -858,38 +858,38 @@ css::uno::Sequence< css::uno::Any >
     }
     else if ( nType == FORFINDREPLACEFLOWTO )
     {
-        SwCrsrShell* pCrsrShell = GetCrsrShell();
-        if ( pCrsrShell )
+        SwCursorShell* pCursorShell = GetCursorShell();
+        if ( pCursorShell )
         {
-            SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr;
+            SwPaM *_pStartCursor = pCursorShell->GetCursor(), *__pStartCursor = _pStartCursor;
             SwContentNode* pPrevNode = nullptr;
-            std::vector<SwFrm*> vFrmList;
+            std::vector<SwFrame*> vFrameList;
             do
             {
-                if ( _pStartCrsr && _pStartCrsr->HasMark() )
+                if ( _pStartCursor && _pStartCursor->HasMark() )
                 {
-                    SwContentNode* pContentNode = _pStartCrsr->GetContentNode();
+                    SwContentNode* pContentNode = _pStartCursor->GetContentNode();
                     if ( pContentNode == pPrevNode )
                     {
                         continue;
                     }
-                    SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : nullptr;
-                    if ( pFrm )
+                    SwFrame* pFrame = pContentNode ? pContentNode->getLayoutFrame( pCursorShell->GetLayout() ) : nullptr;
+                    if ( pFrame )
                     {
-                        vFrmList.push_back( pFrm );
+                        vFrameList.push_back( pFrame );
                     }
 
                     pPrevNode = pContentNode;
                 }
             }
 
-            while( _pStartCrsr && ( (_pStartCrsr = _pStartCrsr->GetNext()) != __pStartCrsr) );
+            while( _pStartCursor && ( (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor) );
 
-            if ( vFrmList.size() )
+            if ( vFrameList.size() )
             {
-                uno::Sequence< uno::Any > aRet(vFrmList.size());
-                std::vector<SwFrm*>::iterator aIter = vFrmList.begin();
-                for ( sal_Int32 nIndex = 0; aIter != vFrmList.end(); ++aIter, nIndex++ )
+                uno::Sequence< uno::Any > aRet(vFrameList.size());
+                std::vector<SwFrame*>::iterator aIter = vFrameList.begin();
+                for ( sal_Int32 nIndex = 0; aIter != vFrameList.end(); ++aIter, nIndex++ )
                 {
                     uno::Reference< XAccessible > xAcc = pAccMap->GetContext(*aIter, false);
                     if ( xAcc.is() )
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index fda48d759d1f..ef3b70b992d2 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -37,8 +37,8 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmb
 
 SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject(
         SwAccessibleMap* pInitMap,
-        const SwFlyFrm* pFlyFrm  ) :
-    SwAccessibleNoTextFrame( pInitMap, AccessibleRole::EMBEDDED_OBJECT, pFlyFrm )
+        const SwFlyFrame* pFlyFrame  ) :
+    SwAccessibleNoTextFrame( pInitMap, AccessibleRole::EMBEDDED_OBJECT, pFlyFrame )
 {
 }
 
@@ -108,16 +108,16 @@ css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
 
     css::uno::Any strRet;
     OUString style;
-    SwFlyFrm* pFFrm = getFlyFrm();
+    SwFlyFrame* pFFrame = getFlyFrame();
 
-    if( pFFrm )
+    if( pFFrame )
     {
         style = "style:";
-        SwContentFrm* pCFrm;
-        pCFrm = pFFrm->ContainsContent();
-        if( pCFrm )
+        SwContentFrame* pCFrame;
+        pCFrame = pFFrame->ContainsContent();
+        if( pCFrame )
         {
-            SwContentNode* pCNode = pCFrm->GetNode();
+            SwContentNode* pCNode = pCFrame->GetNode();
             if( pCNode )
             {
                 style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index c349edc09de4..3141ff580fa4 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -33,7 +33,7 @@ protected:
 
 public:
     SwAccessibleEmbeddedObject( SwAccessibleMap* pInitMap,
-                                const SwFlyFrm* pFlyFrm );
+                                const SwFlyFrame* pFlyFrame );
 
     // XInterface
 
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index c71e3fab4690..e64b0308f4e8 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -45,10 +45,10 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess
 SwAccessibleFootnote::SwAccessibleFootnote(
         SwAccessibleMap* pInitMap,
         bool bIsEndnote,
-        const SwFootnoteFrm *pFootnoteFrm ) :
+        const SwFootnoteFrame *pFootnoteFrame ) :
     SwAccessibleContext( pInitMap,
         bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
-        pFootnoteFrm )
+        pFootnoteFrame )
 {
     SolarMutexGuard aGuard;
 
@@ -57,7 +57,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
 
     OUString sArg;
     const SwTextFootnote *pTextFootnote =
-        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+        static_cast< const SwFootnoteFrame *>( GetFrame() )->GetAttr();
     if( pTextFootnote )
     {
         const SwDoc *pDoc = GetShell()->GetDoc();
@@ -84,7 +84,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
 
     OUString sArg;
     const SwTextFootnote *pTextFootnote =
-        static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+        static_cast< const SwFootnoteFrame *>( GetFrame() )->GetAttr();
     if( pTextFootnote )
     {
         const SwDoc *pDoc = GetMap()->GetShell()->GetDoc();
@@ -128,9 +128,9 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrame *pFootnoteFrame )
 {
-    const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr();
+    const SwTextFootnote *pTextFootnote = pFootnoteFrame ->GetAttr();
     return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ;
 }
 
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index cc48ec61488b..1c715dc305b7 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -24,7 +24,7 @@
 #include <acccontext.hxx>
 
 class SwAccessibleMap;
-class SwFootnoteFrm;
+class SwFootnoteFrame;
 
 class SwAccessibleFootnote : public SwAccessibleContext
 {
@@ -34,7 +34,7 @@ protected:
 public:
     SwAccessibleFootnote( SwAccessibleMap* pInitMap,
                           bool bIsEndnote,
-                          const SwFootnoteFrm *pFootnoteFrm );
+                          const SwFootnoteFrame *pFootnoteFrame );
 
     // XAccessibleContext
 
@@ -64,7 +64,7 @@ public:
     // XTypeProvider
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(css::uno::RuntimeException, std::exception) override;
 
-    static bool IsEndnote( const SwFootnoteFrm *pFrm );
+    static bool IsEndnote( const SwFootnoteFrame *pFrame );
 };
 
 #endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 7ea913440e0a..aafafd8278d4 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -46,12 +46,12 @@ using namespace sw::access;
 // frame's paint area.
 sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
                                             const SwRect& rVisArea,
-                                            const SwFrm *pFrm,
+                                            const SwFrame *pFrame,
                                             bool bInPagePreview )
 {
     sal_Int32 nCount = 0;
 
-    const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap );
+    const SwAccessibleChildSList aVisList( rVisArea, *pFrame, rAccMap );
 
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
     while( aIter != aVisList.end() )
@@ -61,11 +61,11 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
         {
             nCount++;
         }
-        else if( rLower.GetSwFrm() )
+        else if( rLower.GetSwFrame() )
         {
             // There are no unaccessible SdrObjects that count
             nCount += GetChildCount( rAccMap,
-                                     rVisArea, rLower.GetSwFrm(),
+                                     rVisArea, rLower.GetSwFrame(),
                                      bInPagePreview );
         }
         ++aIter;
@@ -77,7 +77,7 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
 SwAccessibleChild SwAccessibleFrame::GetChild(
                                    SwAccessibleMap& rAccMap,
                                    const SwRect& rVisArea,
-                                   const SwFrm& rFrm,
+                                   const SwFrame& rFrame,
                                    sal_Int32& rPos,
                                    bool bInPagePreview )
 {
@@ -85,10 +85,10 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
 
     if( rPos >= 0 )
     {
-        if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+        if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
         {
             // We need a sorted list here
-            const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+            const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
             SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
             while( aIter != aVisMap.cend() && !aRet.IsValid() )
             {
@@ -100,11 +100,11 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
                     else
                         rPos--;
                 }
-                else if( rLower.GetSwFrm() )
+                else if( rLower.GetSwFrame() )
                 {
                     // There are no unaccessible SdrObjects that count
                     aRet = GetChild( rAccMap,
-                                     rVisArea, *(rLower.GetSwFrm()), rPos,
+                                     rVisArea, *(rLower.GetSwFrame()), rPos,
                                      bInPagePreview );
                 }
                 ++aIter;
@@ -114,7 +114,7 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
         {
             // The unsorted list is sorted enough, because it returns lower
             // frames in the correct order.
-            const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+            const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
             SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
             while( aIter != aVisList.end() && !aRet.IsValid() )
             {
@@ -126,11 +126,11 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
                     else
                         rPos--;
                 }
-                else if( rLower.GetSwFrm() )
+                else if( rLower.GetSwFrame() )
                 {
                     // There are no unaccessible SdrObjects that count
                     aRet = GetChild( rAccMap,
-                                     rVisArea, *(rLower.GetSwFrm()), rPos,
+                                     rVisArea, *(rLower.GetSwFrame()), rPos,
                                      bInPagePreview );
                 }
                 ++aIter;
@@ -144,17 +144,17 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
 bool SwAccessibleFrame::GetChildIndex(
                                    SwAccessibleMap& rAccMap,
                                    const SwRect& rVisArea,
-                                   const SwFrm& rFrm,
+                                   const SwFrame& rFrame,
                                    const SwAccessibleChild& rChild,
                                    sal_Int32& rPos,
                                    bool bInPagePreview )
 {
     bool bFound = false;
 
-    if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+    if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
     {
         // We need a sorted list here
-        const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
         SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
         while( aIter != aVisMap.cend() && !bFound )
         {
@@ -166,11 +166,11 @@ bool SwAccessibleFrame::GetChildIndex(
                 else
                     rPos++;
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
                 bFound = GetChildIndex( rAccMap,
-                                        rVisArea, *(rLower.GetSwFrm()), rChild,
+                                        rVisArea, *(rLower.GetSwFrame()), rChild,
                                         rPos, bInPagePreview );
             }
             ++aIter;
@@ -181,7 +181,7 @@ bool SwAccessibleFrame::GetChildIndex(
         // The unsorted list is sorted enough, because it returns lower
         // frames in the correct order.
 
-        const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
         SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
         while( aIter != aVisList.end() && !bFound )
         {
@@ -193,11 +193,11 @@ bool SwAccessibleFrame::GetChildIndex(
                 else
                     rPos++;
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
                 bFound = GetChildIndex( rAccMap,
-                                        rVisArea, *(rLower.GetSwFrm()), rChild,
+                                        rVisArea, *(rLower.GetSwFrame()), rChild,
                                         rPos, bInPagePreview );
             }
             ++aIter;
@@ -208,18 +208,18 @@ bool SwAccessibleFrame::GetChildIndex(
 }
 
 SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
-                                          const SwFrm& rFrm,
+                                          const SwFrame& rFrame,
                                           const Point& rPixPos,
                                           bool bInPagePreview,
                                           SwAccessibleMap& rAccMap )
 {
     SwAccessibleChild aRet;
 
-    if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+    if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
     {
         // We need a sorted list here, and we have to reverse iterate,
         // because objects in front should be returned.
-        const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
         SwAccessibleChildMap::const_reverse_iterator aRIter( aVisMap.crbegin() );
         while( aRIter != aVisMap.crend() && !aRet.IsValid() )
         {
@@ -236,10 +236,10 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
                         aRet = rLower;
                 }
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
-                aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrm()), rPixPos,
+                aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrame()), rPixPos,
                                         bInPagePreview, rAccMap );
             }
             ++aRIter;
@@ -250,7 +250,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
         // The unsorted list is sorted enough, because it returns lower
         // frames in the correct order. Moreover, we can iterate forward,
         // because the lowers don't overlap!
-        const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
         SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
         while( aIter != aVisList.end() && !aRet.IsValid() )
         {
@@ -267,10 +267,10 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
                         aRet = rLower;
                 }
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
-                aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrm()), rPixPos,
+                aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrame()), rPixPos,
                                    bInPagePreview, rAccMap );
             }
             ++aIter;
@@ -282,14 +282,14 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
 
 void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
                                      const SwRect& rVisArea,
-                                     const SwFrm& rFrm,
+                                     const SwFrame& rFrame,
                                      ::std::list< SwAccessibleChild >& rChildren,
                                      bool bInPagePreview )
 {
-    if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+    if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
     {
         // We need a sorted list here
-        const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
         SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
         while( aIter != aVisMap.cend() )
         {
@@ -298,10 +298,10 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
             {
                 rChildren.push_back( rLower );
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
-                GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrm()),
+                GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrame()),
                              rChildren, bInPagePreview );
             }
             ++aIter;
@@ -311,7 +311,7 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
     {
         // The unsorted list is sorted enough, because it returns lower
         // frames in the correct order.
-        const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+        const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
         SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
         while( aIter != aVisList.end() )
         {
@@ -320,10 +320,10 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
             {
                 rChildren.push_back( rLower );
             }
-            else if( rLower.GetSwFrm() )
+            else if( rLower.GetSwFrame() )
             {
                 // There are no unaccessible SdrObjects that count
-                GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrm()),
+                GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrame()),
                              rChildren, bInPagePreview );
             }
             ++aIter;
@@ -332,20 +332,20 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
 }
 
 SwRect SwAccessibleFrame::GetBounds( const SwAccessibleMap& rAccMap,
-                                     const SwFrm *pFrm )
+                                     const SwFrame *pFrame )
 {
-    if( !pFrm )
-        pFrm = GetFrm();
+    if( !pFrame )
+        pFrame = GetFrame();
 
-    SwAccessibleChild aFrm( pFrm );
-    SwRect aBounds( aFrm.GetBounds( rAccMap ).Intersection( maVisArea ) );
+    SwAccessibleChild aFrame( pFrame );
+    SwRect aBounds( aFrame.GetBounds( rAccMap ).Intersection( maVisArea ) );
     return aBounds;
 }
 
 bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
 {
-    const SwFrm *pFrm = GetFrm();
-    if( !pFrm )
+    const SwFrame *pFrame = GetFrame();
+    if( !pFrame )
         return false;
 
     OSL_ENSURE( pVSh, "no view shell" );
@@ -353,7 +353,7 @@ bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
                  pVSh->IsPreview()) )
         return false;
 
-    if( !pFrm->IsRootFrm() && pFrm->IsProtected() )
+    if( !pFrame->IsRootFrame() && pFrame->IsProtected() )
         return false;
 
     return true;
@@ -361,8 +361,8 @@ bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
 
 bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
 {
-    SwAccessibleChild aFrm( GetFrm() );
-    if( !aFrm.GetSwFrm() )
+    SwAccessibleChild aFrame( GetFrame() );
+    if( !aFrame.GetSwFrame() )
         return false;
 
     OSL_ENSURE( pVSh, "no view shell" );
@@ -372,49 +372,49 @@ bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
     const SwViewOption *pVOpt = pVSh->GetViewOptions();
     do
     {
-        const SwFrm *pFrm = aFrm.GetSwFrm();
-        if( pFrm->IsRootFrm() )
+        const SwFrame *pFrame = aFrame.GetSwFrame();
+        if( pFrame->IsRootFrame() )
             return true;
 
-        if( pFrm->IsPageFrm() && !pVOpt->IsPageBack() )
+        if( pFrame->IsPageFrame() && !pVOpt->IsPageBack() )
             return false;
 
-        const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground();
+        const SvxBrushItem &rBack = pFrame->GetAttrSet()->GetBackground();
         if( !rBack.GetColor().GetTransparency() ||
              rBack.GetGraphicPos() != GPOS_NONE )
             return true;
 
         // If a fly frame has a transparent background color, we have to consider the background.
         // But a background color "no fill"/"auto fill" should *not* be considered.
-        if( pFrm->IsFlyFrm() &&
+        if( pFrame->IsFlyFrame() &&
             (rBack.GetColor().GetTransparency() != 0) &&
             (rBack.GetColor() != COL_TRANSPARENT)
           )
             return true;
 
-        if( pFrm->IsSctFrm() )
+        if( pFrame->IsSctFrame() )
         {
-            const SwSection* pSection = static_cast<const SwSectionFrm*>(pFrm)->GetSection();
+            const SwSection* pSection = static_cast<const SwSectionFrame*>(pFrame)->GetSection();
             if( pSection && ( TOX_HEADER_SECTION == pSection->GetType() ||
                 TOX_CONTENT_SECTION == pSection->GetType() ) &&
                 !pVOpt->IsReadonly() &&
                 SwViewOption::IsIndexShadings() )
                 return true;
         }
-        if( pFrm->IsFlyFrm() )
-            aFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm();
+        if( pFrame->IsFlyFrame() )
+            aFrame = static_cast<const SwFlyFrame*>(pFrame)->GetAnchorFrame();
         else
-            aFrm = pFrm->GetUpper();
-    } while( aFrm.GetSwFrm() && !aFrm.IsAccessible( IsInPagePreview() ) );
+            aFrame = pFrame->GetUpper();
+    } while( aFrame.GetSwFrame() && !aFrame.IsAccessible( IsInPagePreview() ) );
 
     return false;
 }
 
 SwAccessibleFrame::SwAccessibleFrame( const SwRect& rVisArea,
-                                      const SwFrm *pF,
+                                      const SwFrame *pF,
                                       bool bIsPagePreview ) :
     maVisArea( rVisArea ),
-    mpFrm( pF ),
+    mpFrame( pF ),
     mbIsInPagePreview( bIsPagePreview ),
     bIsAccDocUse( false )
 {
@@ -424,16 +424,16 @@ SwAccessibleFrame::~SwAccessibleFrame()
 {
 }
 
-const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
+const SwFrame* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrameOrObj,
                                            bool bInPagePreview )
 {
-    return rFrmOrObj.GetParent( bInPagePreview );
+    return rFrameOrObj.GetParent( bInPagePreview );
 }
 
 OUString SwAccessibleFrame::GetFormattedPageNumber() const
 {
-    sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum();
-    sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc()
+    sal_uInt16 nPageNum = GetFrame()->GetVirtPageNum();
+    sal_uInt32 nFormat = GetFrame()->FindPageFrame()->GetPageDesc()
                               ->GetNumType().GetNumberingType();
     if( SVX_NUM_NUMBER_NONE == nFormat )
         nFormat = SVX_NUM_ARABIC;
@@ -444,21 +444,21 @@ OUString SwAccessibleFrame::GetFormattedPageNumber() const
 
 sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap ) const
 {
-    return GetChildCount( rAccMap, maVisArea, mpFrm, IsInPagePreview() );
+    return GetChildCount( rAccMap, maVisArea, mpFrame, IsInPagePreview() );
 }
 
 sw::access::SwAccessibleChild SwAccessibleFrame::GetChild(
                                                 SwAccessibleMap& rAccMap,
                                                 sal_Int32 nPos ) const
 {
-    return SwAccessibleFrame::GetChild( rAccMap, maVisArea, *mpFrm, nPos, IsInPagePreview() );
+    return SwAccessibleFrame::GetChild( rAccMap, maVisArea, *mpFrame, nPos, IsInPagePreview() );
 }
 
 sal_Int32 SwAccessibleFrame::GetChildIndex( SwAccessibleMap& rAccMap,
                                             const sw::access::SwAccessibleChild& rChild ) const
 {
     sal_Int32 nPos = 0;
-    return GetChildIndex( rAccMap, maVisArea, *mpFrm, rChild, nPos, IsInPagePreview() )
+    return GetChildIndex( rAccMap, maVisArea, *mpFrame, rChild, nPos, IsInPagePreview() )
            ? nPos
            : -1L;
 }
@@ -467,19 +467,19 @@ sw::access::SwAccessibleChild SwAccessibleFrame::GetChildAtPixel(
                                                 const Point& rPos,
                                                 SwAccessibleMap& rAccMap ) const
 {
-    return GetChildAtPixel( maVisArea, *mpFrm, rPos, IsInPagePreview(), rAccMap );
+    return GetChildAtPixel( maVisArea, *mpFrame, rPos, IsInPagePreview(), rAccMap );
 }
 
 void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
                                      ::std::list< sw::access::SwAccessibleChild >& rChildren ) const
 {
-    GetChildren( rAccMap, maVisArea, *mpFrm, rChildren, IsInPagePreview() );
+    GetChildren( rAccMap, maVisArea, *mpFrame, rChildren, IsInPagePreview() );
 }
 
 bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap,
-                                       const sw::access::SwAccessibleChild& rFrmOrObj ) const
+                                       const sw::access::SwAccessibleChild& rFrameOrObj ) const
 {
-    return IsShowing( rFrmOrObj.GetBox( rAccMap ) );
+    return IsShowing( rFrameOrObj.GetBox( rAccMap ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 91462027f665..55d9e2497043 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -29,7 +29,7 @@
 #include <accfrmobj.hxx>
 
 class SwAccessibleMap;
-class SwFrm;
+class SwFrame;
 class SwViewShell;
 namespace sw { namespace access {
     class SwAccessibleChild;
@@ -40,39 +40,39 @@ namespace sw { namespace access {
 class SwAccessibleFrame
 {
     SwRect maVisArea;
-    const SwFrm* mpFrm;
+    const SwFrame* mpFrame;
     const bool mbIsInPagePreview;
 
 protected:
     // #i77106# - method needs to be called by new class <SwAccessibleTableColHeaders>
     static sal_Int32 GetChildCount( SwAccessibleMap& rAccMap,
                                     const SwRect& rVisArea,
-                                    const SwFrm *pFrm,
+                                    const SwFrame *pFrame,
                                     bool bInPagePreviewr );
 
 // private:
     static sw::access::SwAccessibleChild GetChild( SwAccessibleMap& rAccMap,
                                                    const SwRect& rVisArea,
-                                                   const SwFrm& rFrm,
+                                                   const SwFrame& rFrame,
                                                    sal_Int32& rPos,
                                                    bool bInPagePreview);
 
     static bool GetChildIndex( SwAccessibleMap& rAccMap,
                                const SwRect& rVisArea,
-                               const SwFrm& rFrm,
+                               const SwFrame& rFrame,
                                const sw::access::SwAccessibleChild& rChild,
                                sal_Int32& rPos,
                                bool bInPagePreview );
 
     static sw::access::SwAccessibleChild GetChildAtPixel( const SwRect& rVisArea,
-                                                          const SwFrm& rFrm,
+                                                          const SwFrame& rFrame,
                                                           const Point& rPos,
                                                           bool bInPagePreview,
                                                           SwAccessibleMap& rAccMap );
 
     static void GetChildren( SwAccessibleMap& rAccMap,
                              const SwRect& rVisArea,
-                             const SwFrm& rFrm,
+                             const SwFrame& rFrame,
                              ::std::list< sw::access::SwAccessibleChild >& rChildren,
                              bool bInPagePreview );
 
@@ -82,8 +82,8 @@ protected:
     bool IsOpaque( SwViewShell *pVSh ) const;
 
     bool IsShowing( const SwAccessibleMap& rAccMap,
-                        const sw::access::SwAccessibleChild& rFrmOrObj ) const;
-    inline bool IsShowing( const SwRect& rFrm ) const;
+                        const sw::access::SwAccessibleChild& rFrameOrObj ) const;
+    inline bool IsShowing( const SwRect& rFrame ) const;
     inline bool IsShowing( const SwAccessibleMap& rAccMap ) const;
 
     inline bool IsInPagePreview() const
@@ -91,23 +91,23 @@ protected:
         return mbIsInPagePreview;
     }
 
-    inline void ClearFrm()
+    inline void ClearFrame()
     {
-        mpFrm = nullptr;
+        mpFrame = nullptr;
     }
 
     SwAccessibleFrame( const SwRect& rVisArea,
-                       const SwFrm *pFrm,
+                       const SwFrame *pFrame,
                        bool bIsPagePreview );
     virtual ~SwAccessibleFrame();
 
     // MT: Move to private area?
     bool bIsAccDocUse;
 public:
-    // Return the SwFrm this context is attached to.
-    const SwFrm* GetFrm() const { return mpFrm; };
+    // Return the SwFrame this context is attached to.
+    const SwFrame* GetFrame() const { return mpFrame; };
 
-    static const SwFrm* GetParent( const sw::access::SwAccessibleChild& rFrmOrObj,
+    static const SwFrame* GetParent( const sw::access::SwAccessibleChild& rFrameOrObj,
                                    bool bInPagePreview );
 
     sal_Int32 GetChildIndex( SwAccessibleMap& rAccMap,
@@ -117,14 +117,14 @@ protected:
     // Return the bounding box of the frame clipped to the vis area. If
     // no frame is specified, use this' frame.
     SwRect GetBounds( const SwAccessibleMap& rAccMap,
-                      const SwFrm *pFrm = nullptr );
+                      const SwFrame *pFrame = nullptr );
 
     // Return the upper that has a context attached. This might be
     // another one than the immediate upper.
-    inline const SwFrm *GetParent() const;
+    inline const SwFrame *GetParent() const;
 
     // Return the lower count or the nth lower, there the lowers have a
-    // not be same one as the SwFrm's lowers
+    // not be same one as the SwFrame's lowers
     sal_Int32 GetChildCount( SwAccessibleMap& rAccMap ) const;
     sw::access::SwAccessibleChild GetChild( SwAccessibleMap& rAccMap,
                                             sal_Int32 nPos ) const;
@@ -146,21 +146,21 @@ protected:
     OUString GetFormattedPageNumber() const;
 };
 
-inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrm ) const
+inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrame ) const
 {
-    return rFrm.IsOver( maVisArea );
+    return rFrame.IsOver( maVisArea );
 }
 
 inline bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap ) const
 {
-    sw::access::SwAccessibleChild aFrmOrObj( GetFrm() );
-    return IsShowing( rAccMap, aFrmOrObj );
+    sw::access::SwAccessibleChild aFrameOrObj( GetFrame() );
+    return IsShowing( rAccMap, aFrameOrObj );
 }
 
-inline const SwFrm *SwAccessibleFrame::GetParent() const
+inline const SwFrame *SwAccessibleFrame::GetParent() const
 {
-    sw::access::SwAccessibleChild aFrmOrObj( GetFrm() );
-    return GetParent( aFrmOrObj, IsInPagePreview()  );
+    sw::access::SwAccessibleChild aFrameOrObj( GetFrame() );
+    return GetParent( aFrameOrObj, IsInPagePreview()  );
 }
 
 #endif
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index f895714fd41c..dcd7e577e0e6 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -53,8 +53,8 @@ bool SwAccessibleFrameBase::IsSelected()
     if( dynamic_cast<const SwFEShell*>( pVSh) !=  nullptr )
     {
         const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
-        const SwFrm *pFlyFrm = pFESh->GetSelectedFlyFrm();
-        if( pFlyFrm == GetFrm() )
+        const SwFrame *pFlyFrame = pFESh->GetSelectedFlyFrame();
+        if( pFlyFrame == GetFrame() )
             bRet = true;
     }
 
@@ -94,21 +94,21 @@ void SwAccessibleFrameBase::GetStates(
         rStateSet.AddState( AccessibleStateType::SELECTED );
 }
 
-sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
+sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrame *pFlyFrame )
 {
     sal_uInt8 nType = ND_TEXTNODE;
-    if( pFlyFrm->Lower() )
+    if( pFlyFrame->Lower() )
     {
-         if( pFlyFrm->Lower()->IsNoTextFrm() )
+         if( pFlyFrame->Lower()->IsNoTextFrame() )
         {
-            const SwContentFrm *pCntFrm =
-                static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
-            nType = pCntFrm->GetNode()->GetNodeType();
+            const SwContentFrame *pContentFrame =
+                static_cast<const SwContentFrame *>( pFlyFrame->Lower() );
+            nType = pContentFrame->GetNode()->GetNodeType();
         }
     }
     else
     {
-        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+        const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
         const SwFormatContent& rContent = pFrameFormat->GetContent();
         const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
         if( pNdIdx )
@@ -126,13 +126,13 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
 SwAccessibleFrameBase::SwAccessibleFrameBase(
         SwAccessibleMap* pInitMap,
         sal_Int16 nInitRole,
-        const SwFlyFrm* pFlyFrm  ) :
-    SwAccessibleContext( pInitMap, nInitRole, pFlyFrm ),
+        const SwFlyFrame* pFlyFrame  ) :
+    SwAccessibleContext( pInitMap, nInitRole, pFlyFrame ),
     bIsSelected( false )
 {
     SolarMutexGuard aGuard;
 
-    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
     const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
     SetName( pFrameFormat->GetName() );
@@ -215,13 +215,13 @@ SwAccessibleFrameBase::~SwAccessibleFrameBase()
 void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 {
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
-    const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( GetFrm() );
+    const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() );
     switch( nWhich )
     {
     case RES_NAME_CHANGED:
-        if(  pFlyFrm )
+        if(  pFlyFrame )
         {
-            const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+            const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
             assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
 
             const OUString sOldName( GetName() );
@@ -272,25 +272,25 @@ void SwAccessibleFrameBase::Dispose( bool bRecursive )
 }
 
 //Get the selection cursor of the document.
-SwPaM* SwAccessibleFrameBase::GetCrsr()
+SwPaM* SwAccessibleFrameBase::GetCursor()
 {
     // get the cursor shell; if we don't have any, we don't have a
     // cursor/selection either
-    SwPaM* pCrsr = nullptr;
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell != nullptr && !pCrsrShell->IsTableMode() )
+    SwPaM* pCursor = nullptr;
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell != nullptr && !pCursorShell->IsTableMode() )
     {
-        SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCrsrShell) !=  nullptr
-                            ? static_cast< SwFEShell * >( pCrsrShell ) : nullptr;
+        SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCursorShell) !=  nullptr
+                            ? static_cast< SwFEShell * >( pCursorShell ) : nullptr;
         if( !pFESh ||
-            !(pFESh->IsFrmSelected() || pFESh->IsObjSelected() > 0) )
+            !(pFESh->IsFrameSelected() || pFESh->IsObjSelected() > 0) )
         {
             // get the selection, and test whether it affects our text node
-            pCrsr = pCrsrShell->GetCrsr( false /* ??? */ );
+            pCursor = pCursorShell->GetCursor( false /* ??? */ );
         }
     }
 
-    return pCrsr;
+    return pCursor;
 }
 
 //Return the selected state of the object.
@@ -305,8 +305,8 @@ bool SwAccessibleFrameBase::GetSelectedState( )
     }
 
     // SELETED.
-    SwFlyFrm* pFlyFrm = getFlyFrm();
-    const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+    SwFlyFrame* pFlyFrame = getFlyFrame();
+    const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
     const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
     const SwPosition *pPos = pAnchor.GetContentAnchor();
     if( !pPos )
@@ -314,23 +314,23 @@ bool SwAccessibleFrameBase::GetSelectedState( )
     int pIndex = pPos->nContent.GetIndex();
     if( pPos->nNode.GetNode().GetTextNode() )
     {
-        SwPaM* pCrsr = GetCrsr();
-        if( pCrsr != nullptr )
+        SwPaM* pCursor = GetCursor();
+        if( pCursor != nullptr )
         {
             const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
             sal_uLong nHere = pNode->GetIndex();
 
             // iterate over ring
-            SwPaM* pRingStart = pCrsr;
+            SwPaM* pRingStart = pCursor;
             do
             {
                 // ignore, if no mark
-                if( pCrsr->HasMark() )
+                if( pCursor->HasMark() )
                 {
-                    // check whether nHere is 'inside' pCrsr
-                    SwPosition* pStart = pCrsr->Start();
+                    // check whether nHere is 'inside' pCursor
+                    SwPosition* pStart = pCursor->Start();
                     sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                    SwPosition* pEnd = pCrsr->End();
+                    SwPosition* pEnd = pCursor->End();
                     sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                     if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex)  )
                     {
@@ -353,26 +353,26 @@ bool SwAccessibleFrameBase::GetSelectedState( )
                 // else: this PaM is collapsed and doesn't select anything
 
                 // next PaM in ring
-                pCrsr = pCrsr->GetNext();
+                pCursor = pCursor->GetNext();
             }
-            while( pCrsr != pRingStart );
+            while( pCursor != pRingStart );
         }
     }
     return false;
 }
 
-SwFlyFrm* SwAccessibleFrameBase::getFlyFrm() const
+SwFlyFrame* SwAccessibleFrameBase::getFlyFrame() const
 {
-    SwFlyFrm* pFlyFrm = nullptr;
+    SwFlyFrame* pFlyFrame = nullptr;
 
-    const SwFrm* pFrm = GetFrm();
-    assert(pFrm);
-    if( pFrm->IsFlyFrm() )
+    const SwFrame* pFrame = GetFrame();
+    assert(pFrame);
+    if( pFrame->IsFlyFrame() )
     {
-        pFlyFrm = static_cast<SwFlyFrm*>( const_cast<SwFrm*>( pFrm ) );
+        pFlyFrame = static_cast<SwFlyFrame*>( const_cast<SwFrame*>( pFrame ) );
     }
 
-    return pFlyFrm;
+    return pFlyFrame;
 }
 
 bool SwAccessibleFrameBase::SetSelectedState( bool )
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index 0be3137423c5..45335a43ad31 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -24,7 +24,7 @@
 #include <calbck.hxx>
 #include <pam.hxx>
 
-class SwFlyFrm;
+class SwFlyFrame;
 
 class SwAccessibleFrameBase : public SwAccessibleContext,
                               public SwClient
@@ -37,9 +37,9 @@ protected:
     // This derived class additionally sets SELECTABLE(1), SELECTED(+),
     // FOCUSABLE(1) and FOCUSED(+)
     virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override;
-    SwFlyFrm* getFlyFrm() const;
+    SwFlyFrame* getFlyFrame() const;
     bool GetSelectedState( );
-    SwPaM* GetCrsr();
+    SwPaM* GetCursor();
 
     virtual void _InvalidateCursorPos() override;
     virtual void _InvalidateFocus() override;
@@ -50,11 +50,11 @@ protected:
 public:
     SwAccessibleFrameBase( SwAccessibleMap* pInitMap,
                            sal_Int16 nInitRole,
-                           const SwFlyFrm *pFlyFrm );
+                           const SwFlyFrame *pFlyFrame );
 
     virtual bool HasCursor() override;   // required by map to remember that object
 
-    static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm );
+    static sal_uInt8 GetNodeType( const SwFlyFrame *pFlyFrame );
 
     // The object is not visible an longer and should be destroyed
     virtual void Dispose( bool bRecursive = false ) override;
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index a449247cd103..cbd7b518e486 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -40,45 +40,45 @@
 namespace sw { namespace access {
 
 SwAccessibleChild::SwAccessibleChild()
-    : mpFrm( nullptr )
+    : mpFrame( nullptr )
     , mpDrawObj( nullptr )
     , mpWindow( nullptr )
 {}
 
 SwAccessibleChild::SwAccessibleChild( const SdrObject* pDrawObj )
-    : mpFrm( nullptr )
+    : mpFrame( nullptr )
     , mpDrawObj( nullptr )
     , mpWindow( nullptr )
 {
     Init( pDrawObj );
 }
 
-SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm )
-    : mpFrm( nullptr )
+SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame )
+    : mpFrame( nullptr )
     , mpDrawObj( nullptr )
     , mpWindow( nullptr )
 {
-    Init( pFrm );
+    Init( pFrame );
 }
 
 SwAccessibleChild::SwAccessibleChild( vcl::Window* pWindow )
-    : mpFrm( nullptr )
+    : mpFrame( nullptr )
     , mpDrawObj( nullptr )
     , mpWindow( nullptr )
 {
     Init( pWindow );
 }
 
-SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
+SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame,
                                       const SdrObject* pDrawObj,
                                       vcl::Window* pWindow )
-    : mpFrm( nullptr )
+    : mpFrame( nullptr )
     , mpDrawObj( nullptr )
     , mpWindow( nullptr )
 {
-    if ( pFrm )
+    if ( pFrame )
     {
-        Init( pFrm );
+        Init( pFrame );
     }
     else if ( pDrawObj )
     {
@@ -88,7 +88,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
     {
         Init( pWindow );
     }
-    OSL_ENSURE( (!pFrm || pFrm == mpFrm) &&
+    OSL_ENSURE( (!pFrame || pFrame == mpFrame) &&
             (!pDrawObj || pDrawObj == mpDrawObj) &&
             (!pWindow || pWindow == mpWindow),
             "invalid frame/object/window combination" );
@@ -98,17 +98,17 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
 void SwAccessibleChild::Init( const SdrObject* pDrawObj )
 {
     mpDrawObj = pDrawObj;
-    mpFrm = mpDrawObj && dynamic_cast<const SwVirtFlyDrawObj*>( mpDrawObj) !=  nullptr
-            ? static_cast < const SwVirtFlyDrawObj * >( mpDrawObj )->GetFlyFrm()
+    mpFrame = mpDrawObj && dynamic_cast<const SwVirtFlyDrawObj*>( mpDrawObj) !=  nullptr
+            ? static_cast < const SwVirtFlyDrawObj * >( mpDrawObj )->GetFlyFrame()
             : nullptr;
     mpWindow = nullptr;
 }
 
-void SwAccessibleChild::Init( const SwFrm* pFrm )
+void SwAccessibleChild::Init( const SwFrame* pFrame )
 {
-    mpFrm = pFrm;
-    mpDrawObj = mpFrm && mpFrm->IsFlyFrm()
-                ? static_cast < const SwFlyFrm * >( mpFrm )->GetVirtDrawObj()
+    mpFrame = pFrame;
+    mpDrawObj = mpFrame && mpFrame->IsFlyFrame()
+                ? static_cast < const SwFlyFrame * >( mpFrame )->GetVirtDrawObj()
                 : nullptr;
     mpWindow = nullptr;
 }
@@ -116,7 +116,7 @@ void SwAccessibleChild::Init( const SwFrm* pFrm )
 void SwAccessibleChild::Init( vcl::Window* pWindow )
 {
     mpWindow = pWindow;
-    mpFrm = nullptr;
+    mpFrame = nullptr;
     mpDrawObj = nullptr;
 }
 
@@ -124,14 +124,14 @@ bool SwAccessibleChild::IsAccessible( bool bPagePreview ) const
 {
     bool bRet( false );
 
-    if ( mpFrm )
+    if ( mpFrame )
     {
-        bRet = mpFrm->IsAccessibleFrm() &&
-               ( !mpFrm->IsCellFrm() ||
-                 static_cast<const SwCellFrm *>( mpFrm )->GetTabBox()->GetSttNd() != nullptr ) &&
-               !mpFrm->IsInCoveredCell() &&
+        bRet = mpFrame->IsAccessibleFrame() &&
+               ( !mpFrame->IsCellFrame() ||
+                 static_cast<const SwCellFrame *>( mpFrame )->GetTabBox()->GetSttNd() != nullptr ) &&
+               !mpFrame->IsInCoveredCell() &&
                ( bPagePreview ||
-                 !mpFrm->IsPageFrm() );
+                 !mpFrame->IsPageFrame() );
     }
     else if ( mpDrawObj )
     {
@@ -149,10 +149,10 @@ bool SwAccessibleChild::IsBoundAsChar() const
 {
     bool bRet( false );
 
-    if ( mpFrm )
+    if ( mpFrame )
     {
-        bRet = mpFrm->IsFlyFrm() &&
-               static_cast< const SwFlyFrm *>(mpFrm)->IsFlyInCntFrm();
+        bRet = mpFrame->IsFlyFrame() &&
+               static_cast< const SwFlyFrame *>(mpFrame)->IsFlyInContentFrame();
     }
     else if ( mpDrawObj )
     {
@@ -169,7 +169,7 @@ bool SwAccessibleChild::IsBoundAsChar() const
 }
 
 SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
-    : mpFrm( r.mpFrm )
+    : mpFrame( r.mpFrame )
     , mpDrawObj( r.mpDrawObj )
     , mpWindow( r.mpWindow )
 {}
@@ -177,7 +177,7 @@ SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
 SwAccessibleChild& SwAccessibleChild::operator=( const SwAccessibleChild& r )
 {
     mpDrawObj = r.mpDrawObj;
-    mpFrm = r.mpFrm;
+    mpFrame = r.mpFrame;
     mpWindow = r.mpWindow;
 
     return *this;
@@ -189,9 +189,9 @@ SwAccessibleChild& SwAccessibleChild::operator=( const SdrObject* pDrawObj )
     return *this;
 }
 
-SwAccessibleChild& SwAccessibleChild::operator=( const SwFrm* pFrm )
+SwAccessibleChild& SwAccessibleChild::operator=( const SwFrame* pFrame )
 {
-    Init( pFrm );
+    Init( pFrame );
     return *this;
 }
 
@@ -203,14 +203,14 @@ SwAccessibleChild& SwAccessibleChild::operator=( vcl::Window* pWindow )
 
 bool SwAccessibleChild::operator==( const SwAccessibleChild& r ) const
 {
-    return mpFrm == r.mpFrm &&
+    return mpFrame == r.mpFrame &&
            mpDrawObj == r.mpDrawObj &&
            mpWindow == r.mpWindow;
 }
 
 bool SwAccessibleChild::IsValid() const
 {
-    return mpFrm != nullptr ||
+    return mpFrame != nullptr ||
            mpDrawObj != nullptr ||
            mpWindow != nullptr;
 }
@@ -219,17 +219,17 @@ bool SwAccessibleChild::IsVisibleChildrenOnly() const
 {
     bool bRet( false );
 
-    if ( !mpFrm )
+    if ( !mpFrame )
     {
         bRet = true;
     }
     else
     {
-        bRet = mpFrm->IsRootFrm() ||
-               !( mpFrm->IsTabFrm() ||
-                  mpFrm->IsInTab() ||
+        bRet = mpFrame->IsRootFrame() ||
+               !( mpFrame->IsTabFrame() ||
+                  mpFrame->IsInTab() ||
                   ( IsBoundAsChar() &&
-                    static_cast<const SwFlyFrm*>(mpFrm)->GetAnchorFrm()->IsInTab() ) );
+                    static_cast<const SwFlyFrame*>(mpFrame)->GetAnchorFrame()->IsInTab() ) );
     }
 
     return bRet;
@@ -239,21 +239,21 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& rAccMap ) const
 {
     SwRect aBox;
 
-    if ( mpFrm )
+    if ( mpFrame )
     {
-        if ( mpFrm->IsPageFrm() &&
-             static_cast< const SwPageFrm * >( mpFrm )->IsEmptyPage() )
+        if ( mpFrame->IsPageFrame() &&
+             static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
         {
-            aBox = SwRect( mpFrm->Frm().Left(), mpFrm->Frm().Top()-1, 1, 1 );
+            aBox = SwRect( mpFrame->Frame().Left(), mpFrame->Frame().Top()-1, 1, 1 );
         }
-        else if ( mpFrm->IsTabFrm() )
+        else if ( mpFrame->IsTabFrame() )
         {
-            aBox = SwRect( mpFrm->Frm() );
-            aBox.Intersection( mpFrm->GetUpper()->Frm() );
+            aBox = SwRect( mpFrame->Frame() );
+            aBox.Intersection( mpFrame->GetUpper()->Frame() );
         }
         else
         {
-            aBox = mpFrm->Frm();
+            aBox = mpFrame->Frame();
         }
     }
     else if( mpDrawObj )
@@ -278,15 +278,15 @@ SwRect SwAccessibleChild::GetBounds( const SwAccessibleMap& rAccMap ) const
 {
     SwRect aBound;
 
-    if( mpFrm )
+    if( mpFrame )
     {
-        if( mpFrm->IsPageFrm() &&
-            static_cast< const SwPageFrm * >( mpFrm )->IsEmptyPage() )
+        if( mpFrame->IsPageFrame() &&
+            static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
         {
-            aBound = SwRect( mpFrm->Frm().Left(), mpFrm->Frm().Top()-1, 0, 0 );
+            aBound = SwRect( mpFrame->Frame().Left(), mpFrame->Frame().Top()-1, 0, 0 );
         }
         else
-            aBound = mpFrm->PaintArea();
+            aBound = mpFrame->PaintArea();
     }
     else if( mpDrawObj )
     {
@@ -312,19 +312,19 @@ bool SwAccessibleChild::AlwaysIncludeAsChild() const
     return bAlwaysIncludedAsChild;
 }
 
-const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
+const SwFrame* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
 {
-    const SwFrm* pParent( nullptr );
+    const SwFrame* pParent( nullptr );
 
-    if ( mpFrm )
+    if ( mpFrame )
     {
-        if( mpFrm->IsFlyFrm() )
+        if( mpFrame->IsFlyFrame() )
         {
-            const SwFlyFrm* pFly = static_cast< const SwFlyFrm *>( mpFrm );
-            if( pFly->IsFlyInCntFrm() )
+            const SwFlyFrame* pFly = static_cast< const SwFlyFrame *>( mpFrame );
+            if( pFly->IsFlyInContentFrame() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
-                pParent = pFly->GetAnchorFrm();
+                pParent = pFly->GetAnchorFrame();
                 OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
             }
@@ -333,19 +333,19 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
                 // In any other case the parent is the root frm
                 // (in page preview, the page frame)
                 if( bInPagePreview )
-                    pParent = pFly->FindPageFrm();
+                    pParent = pFly->FindPageFrame();
                 else
-                    pParent = pFly->getRootFrm();
+                    pParent = pFly->getRootFrame();
             }
         }
         else
         {
-            SwAccessibleChild aUpper( mpFrm->GetUpper() );
-            while( aUpper.GetSwFrm() && !aUpper.IsAccessible(bInPagePreview) )
+            SwAccessibleChild aUpper( mpFrame->GetUpper() );
+            while( aUpper.GetSwFrame() && !aUpper.IsAccessible(bInPagePreview) )
             {
-                aUpper = aUpper.GetSwFrm()->GetUpper();
+                aUpper = aUpper.GetSwFrame()->GetUpper();
             }
-            pParent = aUpper.GetSwFrm();
+            pParent = aUpper.GetSwFrame();
         }
     }
     else if( mpDrawObj )
@@ -360,7 +360,7 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
             if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
             {
                 // For FLY_AS_CHAR the parent is the anchor
-                pParent = pContact->GetAnchorFrm();
+                pParent = pContact->GetAnchorFrame();
                 OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
                         "parent is not accessible" );
 
@@ -369,9 +369,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
             {
                 // In any other case the parent is the root frm
                 if( bInPagePreview )
-                    pParent = pContact->GetAnchorFrm()->FindPageFrm();
+                    pParent = pContact->GetAnchorFrame()->FindPageFrame();
                 else
-                    pParent = pContact->GetAnchorFrm()->getRootFrm();
+                    pParent = pContact->GetAnchorFrame()->getRootFrame();
             }
         }
     }
@@ -393,7 +393,7 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
                                 dynamic_cast< SwAccessibleContext *>( xAccParent.get() );
                     if ( pAccParentImpl )
                     {
-                        pParent = pAccParentImpl->GetFrm();
+                        pParent = pAccParentImpl->GetFrame();
                     }
                 }
             }
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 31a489e43640..e05ddc100f45 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -23,7 +23,7 @@
 #include <vcl/vclptr.hxx>
 
 class SwAccessibleMap;
-class SwFrm;
+class SwFrame;
 class SdrObject;
 namespace vcl { class Window; }
 class SwRect;
@@ -35,9 +35,9 @@ class SwAccessibleChild
     public:
         SwAccessibleChild();
         explicit SwAccessibleChild( const SdrObject* pDrawObj );
-        explicit SwAccessibleChild( const SwFrm* pFrm );
+        explicit SwAccessibleChild( const SwFrame* pFrame );
         explicit SwAccessibleChild( vcl::Window* pWindow );
-        SwAccessibleChild( const SwFrm* pFrm,
+        SwAccessibleChild( const SwFrame* pFrame,
                            const SdrObject* pDrawObj,
                            vcl::Window* pWindow );
 
@@ -45,18 +45,18 @@ class SwAccessibleChild
         SwAccessibleChild& operator=( const SwAccessibleChild& r );
 
         SwAccessibleChild& operator=( const SdrObject* pDrawObj );
-        SwAccessibleChild& operator=( const SwFrm* pFrm );
+        SwAccessibleChild& operator=( const SwFrame* pFrame );
         SwAccessibleChild& operator=( vcl::Window* pWindow );
 
         bool operator==( const SwAccessibleChild& r ) const;
 
         bool IsValid() const;
 
-        const SwFrm* GetSwFrm() const { return mpFrm; }
+        const SwFrame* GetSwFrame() const { return mpFrame; }
         const SdrObject* GetDrawObject() const { return mpDrawObj; }
         vcl::Window* GetWindow() const { return mpWindow; }
 
-        const SwFrm* GetParent( const bool bInPagePreview ) const;
+        const SwFrame* GetParent( const bool bInPagePreview ) const;
 
         bool IsAccessible( bool bPagePreview ) const;
         bool IsBoundAsChar() const;
@@ -70,12 +70,12 @@ class SwAccessibleChild
         bool AlwaysIncludeAsChild() const;
 
     private:
-        const SwFrm* mpFrm;
+        const SwFrame* mpFrame;
         const SdrObject* mpDrawObj;
         VclPtr<vcl::Window> mpWindow;
 
         void Init( const SdrObject* pDrawObj );
-        void Init( const SwFrm* pFrm );
+        void Init( const SwFrame* pFrame );
         void Init( vcl::Window* pWindow );
 };
 
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 05168a432a36..ec2622178b97 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -37,16 +37,16 @@
 using namespace sw::access;
 
 SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
-                                            const SwFrm& rFrm,
+                                            const SwFrame& rFrame,
                                             SwAccessibleMap& rAccMap )
     : nHellId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
     , nControlsId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
 {
-    const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrm ).IsVisibleChildrenOnly();
+    const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrame ).IsVisibleChildrenOnly();
 
     sal_uInt32 nPos = 0;
-    SwAccessibleChild aLower( rFrm.GetLower() );
-    while( aLower.GetSwFrm() )
+    SwAccessibleChild aLower( rFrame.GetLower() );
+    while( aLower.GetSwFrame() )
     {
         if ( !bVisibleChildrenOnly ||
              aLower.AlwaysIncludeAsChild() ||
@@ -55,15 +55,15 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
             insert( nPos++, SwAccessibleChildMapKey::TEXT, aLower );
         }
 
-        aLower = aLower.GetSwFrm()->GetNext();
+        aLower = aLower.GetSwFrame()->GetNext();
     }
 
-    if ( rFrm.IsPageFrm() )
+    if ( rFrame.IsPageFrame() )
     {
         OSL_ENSURE( bVisibleChildrenOnly, "page frame within tab frame???" );
-        const SwPageFrm *pPgFrm =
-            static_cast< const SwPageFrm * >( &rFrm );
-        const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
+        const SwPageFrame *pPgFrame =
+            static_cast< const SwPageFrame * >( &rFrame );
+        const SwSortedObjs *pObjs = pPgFrame->GetSortedObjs();
         if ( pObjs )
         {
             for( size_t i=0; i<pObjs->size(); ++i )
@@ -76,9 +76,9 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
             }
         }
     }
-    else if( rFrm.IsTextFrm() )
+    else if( rFrame.IsTextFrame() )
     {
-        const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
+        const SwSortedObjs *pObjs = rFrame.GetDrawObjs();
         if ( pObjs )
         {
             for( size_t i=0; i<pObjs->size(); ++i )
@@ -96,7 +96,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
 
         {
             ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                rAccMap.GetContextImpl( &rFrm, false );
+                                rAccMap.GetContextImpl( &rFrame, false );
             if( xAccImpl.is() )
             {
                 SwAccessibleContext* pAccImpl = xAccImpl.get();
@@ -149,12 +149,12 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
     return insert( aEntry );
 }
 
-bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
+bool SwAccessibleChildMap::IsSortingRequired( const SwFrame& rFrame )
 {
-    return ( rFrm.IsPageFrm() &&
-             static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
-           ( rFrm.IsTextFrm() &&
-             rFrm.GetDrawObjs() );
+    return ( rFrame.IsPageFrame() &&
+             static_cast< const SwPageFrame& >( rFrame ).GetSortedObjs() ) ||
+           ( rFrame.IsTextFrame() &&
+             rFrame.GetDrawObjs() );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index d2593333f819..53ccbd0dc978 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -27,7 +27,7 @@
 
 class SwAccessibleMap;
 class SwRect;
-class SwFrm;
+class SwFrame;
 class SdrObject;
 
 class SwAccessibleChildMapKey
@@ -75,9 +75,9 @@ public:
     /* MT: Need to get this position parameter stuff in dev300 somehow...
     //This methods are used to insert an object to the map, adding a position parameter.
     ::std::pair< iterator, bool > insert( sal_uInt32 nOrd, Point nPos,
-                                          const SwFrmOrObj& rLower );
+                                          const SwFrameOrObj& rLower );
     ::std::pair< iterator, bool > insert( const SdrObject *pObj,
-                                          const SwFrmOrObj& rLower,
+                                          const SwFrameOrObj& rLower,
                                           const SwDoc *pDoc,
                                           Point nPos);
     */
@@ -113,10 +113,10 @@ private:
 
 public:
     SwAccessibleChildMap( const SwRect& rVisArea,
-                          const SwFrm& rFrm,
+                          const SwFrame& rFrame,
                           SwAccessibleMap& rAccMap );
 
-    static bool IsSortingRequired( const SwFrm& rFrm );
+    static bool IsSortingRequired( const SwFrame& rFrame );
 
     const_iterator cbegin() const { return maMap.cbegin(); }
     const_iterator cend() const { return maMap.cend(); }
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 5c3cb557d0a1..36d6a880b5b0 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -31,24 +31,24 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
     const SwAccessibleChildSList& rLst,
     SwAccessibleMap& rAccMap )
     : rList( rLst ),
-      aCurr( rList.GetFrm().GetLower() ),
+      aCurr( rList.GetFrame().GetLower() ),
       nNextObj( 0 )
 {
-    if( !aCurr.GetSwFrm() )
+    if( !aCurr.GetSwFrame() )
     {
-        const SwFrm& rFrm = rList.GetFrm();
-        if( rFrm.IsPageFrm() )
+        const SwFrame& rFrame = rList.GetFrame();
+        if( rFrame.IsPageFrame() )
         {
-            const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm );
-            const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs();
+            const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
+            const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
             if( pObjs && pObjs->size() )
             {
                 aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
             }
         }
-        else if( rFrm.IsTextFrm() )
+        else if( rFrame.IsTextFrame() )
         {
-            const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
+            const SwSortedObjs *pObjs = rFrame.GetDrawObjs();
             if ( pObjs && pObjs->size() )
             {
                 aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
@@ -62,7 +62,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
             if ( !aCurr.IsValid() )
             {
                 ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                    rAccMap.GetContextImpl( &rFrm, false );
+                                    rAccMap.GetContextImpl( &rFrame, false );
                 if( xAccImpl.is() )
                 {
                     SwAccessibleContext* pAccImpl = xAccImpl.get();
@@ -92,10 +92,10 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
     {
         bNextTaken = false;
     }
-    else if( aCurr.GetSwFrm() )
+    else if( aCurr.GetSwFrame() )
     {
-        aCurr = aCurr.GetSwFrm()->GetNext();
-        if( !aCurr.GetSwFrm() )
+        aCurr = aCurr.GetSwFrame()->GetNext();
+        if( !aCurr.GetSwFrame() )
         {
             bNextTaken = false;
         }
@@ -103,18 +103,18 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
 
     if( !bNextTaken )
     {
-        const SwFrm& rFrm = rList.GetFrm();
-        if( rFrm.IsPageFrm() )
+        const SwFrame& rFrame = rList.GetFrame();
+        if( rFrame.IsPageFrame() )
         {
-            const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm );
-            const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs();
+            const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
+            const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
             aCurr = ( pObjs && nNextObj < pObjs->size() )
                     ? (*pObjs)[nNextObj++]->GetDrawObj()
                     : static_cast< const SdrObject *>( nullptr );
         }
-        else if( rFrm.IsTextFrm() )
+        else if( rFrame.IsTextFrame() )
         {
-            const SwSortedObjs* pObjs = rFrm.GetDrawObjs();
+            const SwSortedObjs* pObjs = rFrame.GetDrawObjs();
             const size_t nObjsCount = pObjs ? pObjs->size() : 0;
             aCurr = ( pObjs && nNextObj < nObjsCount )
                     ? (*pObjs)[nNextObj++]->GetDrawObj()
@@ -128,7 +128,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
             if ( !aCurr.IsValid() )
             {
                 ::rtl::Reference < SwAccessibleContext > xAccImpl =
-                                    rList.GetAccMap().GetContextImpl( &rFrm, false );
+                                    rList.GetAccMap().GetContextImpl( &rFrame, false );
                 if( xAccImpl.is() )
                 {
                     SwAccessibleContext* pAccImpl = xAccImpl.get();
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index d009ed72cf1b..863d86e9d6d2 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -76,27 +76,27 @@ public:
 class SwAccessibleChildSList
 {
     const SwRect maVisArea;
-    const SwFrm& mrFrm;
+    const SwFrame& mrFrame;
     const bool mbVisibleChildrenOnly;
     SwAccessibleMap& mrAccMap;
 
 public:
     typedef SwAccessibleChildSList_const_iterator const_iterator;
 
-    inline SwAccessibleChildSList( const SwFrm& rFrm,
+    inline SwAccessibleChildSList( const SwFrame& rFrame,
                                    SwAccessibleMap& rAccMap )
         : maVisArea()
-        , mrFrm( rFrm )
+        , mrFrame( rFrame )
         , mbVisibleChildrenOnly( false )
         , mrAccMap( rAccMap )
     {}
 
     inline SwAccessibleChildSList( const SwRect& rVisArea,
-                                   const SwFrm& rFrm,
+                                   const SwFrame& rFrame,
                                    SwAccessibleMap& rAccMap )
         : maVisArea( rVisArea )
-        , mrFrm( rFrm )
-        , mbVisibleChildrenOnly( sw::access::SwAccessibleChild( &rFrm ).IsVisibleChildrenOnly() )
+        , mrFrame( rFrame )
+        , mbVisibleChildrenOnly( sw::access::SwAccessibleChild( &rFrame ).IsVisibleChildrenOnly() )
         , mrAccMap( rAccMap )
     {
     }
@@ -111,9 +111,9 @@ public:
         return SwAccessibleChildSList_const_iterator( *this );
     }
 
-    inline const SwFrm& GetFrm() const
+    inline const SwFrame& GetFrame() const
     {
-        return mrFrm;
+        return mrFrame;
     }
 
     inline bool IsVisibleChildrenOnly() const
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index c29ca478c9ca..6c6a697d9adc 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -33,8 +33,8 @@ using namespace ::com::sun::star::accessibility;
 
 SwAccessibleGraphic::SwAccessibleGraphic(
         SwAccessibleMap* pInitMap,
-        const SwFlyFrm* pFlyFrm  ) :
-    SwAccessibleNoTextFrame( pInitMap, AccessibleRole::GRAPHIC, pFlyFrm )
+        const SwFlyFrame* pFlyFrame  ) :
+    SwAccessibleNoTextFrame( pInitMap, AccessibleRole::GRAPHIC, pFlyFrame )
 {
 }
 
@@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
 {
     SolarMutexGuard g;
 
-    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrame*>(GetFrame())->GetFormat()->GetURL() );
 
     if (aURL.GetMap())
         return AccessibleRole::IMAGE_MAP;
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 35c50b29ddd0..44bac5c5e764 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -29,7 +29,7 @@ protected:
 
 public:
     SwAccessibleGraphic( SwAccessibleMap* pInitMap,
-                         const SwFlyFrm *pFlyFrm );
+                         const SwFlyFrame *pFlyFrame );
 
     // XServiceInfo
 
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index aa594c5fe908..36327d58f70f 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -38,23 +38,23 @@ const sal_Char sImplementationNameFooter[] = "com.sun.star.comp.Writer.SwAccessi
 
 SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
         SwAccessibleMap* pInitMap,
-        const SwHeaderFrm* pHdFrm    ) :
-    SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrm )
+        const SwHeaderFrame* pHdFrame    ) :
+    SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrame )
 {
     SolarMutexGuard aGuard;
 
-    OUString sArg( OUString::number( pHdFrm->GetPhyPageNum() ) );
+    OUString sArg( OUString::number( pHdFrame->GetPhyPageNum() ) );
     SetName( GetResource( STR_ACCESS_HEADER_NAME, &sArg ) );
 }
 
 SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
         SwAccessibleMap* pInitMap,
-        const SwFooterFrm* pFtFrm    ) :
-    SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrm )
+        const SwFooterFrame* pFtFrame    ) :
+    SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrame )
 {
     SolarMutexGuard aGuard;
 
-    OUString sArg( OUString::number( pFtFrm->GetPhyPageNum() ) );
+    OUString sArg( OUString::number( pFtFrame->GetPhyPageNum() ) );
     SetName( GetResource( STR_ACCESS_FOOTER_NAME, &sArg ) );
 }
 
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 7f91d40eca7a..b3fe7aeb2796 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -22,8 +22,8 @@
 
 #include "acccontext.hxx"
 
-class SwHeaderFrm;
-class SwFooterFrm;
+class SwHeaderFrame;
+class SwFooterFrame;
 
 class SwAccessibleHeaderFooter : public SwAccessibleContext
 {
@@ -32,9 +32,9 @@ protected:
 
 public:
     SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
-                              const SwHeaderFrm* pHdFrm );
+                              const SwHeaderFrame* pHdFrame );
     SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
-                              const SwFooterFrm* pFtFrm );
+                              const SwFooterFrame* pFtFrame );
 
     // XAccessibleContext
 
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b8504b61f353..817bdfd2ebc9 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -76,9 +76,9 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::sw::access;
 
-struct SwFrmFunc
+struct SwFrameFunc
 {
-    bool operator()( const SwFrm * p1, const SwFrm * p2) const
+    bool operator()( const SwFrame * p1, const SwFrame * p2) const
     {
         return p1 < p2;
     }
@@ -87,10 +87,10 @@ struct SwFrmFunc
 class SwAccessibleContextMap_Impl
 {
 public:
-    typedef const SwFrm *                                               key_type;
+    typedef const SwFrame *                                               key_type;
     typedef uno::WeakReference < XAccessible >                          mapped_type;
     typedef std::pair<const key_type,mapped_type>                       value_type;
-    typedef SwFrmFunc                                                   key_compare;
+    typedef SwFrameFunc                                                   key_compare;
     typedef std::map<key_type,mapped_type,key_compare>::iterator        iterator;
     typedef std::map<key_type,mapped_type,key_compare>::const_iterator  const_iterator;
 private:
@@ -338,36 +338,36 @@ private:
     SwRect      maOldBox;                       // the old bounds for CHILD_POS_CHANGED
                                                 // and POS_CHANGED
     uno::WeakReference < XAccessible > mxAcc;   // The object that fires the event
-    SwAccessibleChild   maFrmOrObj;             // the child for CHILD_POS_CHANGED and
+    SwAccessibleChild   maFrameOrObj;             // the child for CHILD_POS_CHANGED and
                                                 // the same as xAcc for any other
                                                 // event type
     EventType   meType;                         // The event type
     AccessibleStates mnStates;                 // check states or update caret pos
 
 public:
-    const SwFrm* mpParentFrm;   // The object that fires the event
-    bool IsNoXaccParentFrm() const
+    const SwFrame* mpParentFrame;   // The object that fires the event
+    bool IsNoXaccParentFrame() const
     {
-        return CHILD_POS_CHANGED == meType && mpParentFrm != nullptr;
+        return CHILD_POS_CHANGED == meType && mpParentFrame != nullptr;
     }
 
 public:
     SwAccessibleEvent_Impl( EventType eT,
                             SwAccessibleContext *pA,
-                            const SwAccessibleChild& rFrmOrObj )
+                            const SwAccessibleChild& rFrameOrObj )
         : mxAcc( pA ),
-          maFrmOrObj( rFrmOrObj ),
+          maFrameOrObj( rFrameOrObj ),
           meType( eT ),
           mnStates( AccessibleStates::NONE ),
-          mpParentFrm( nullptr )
+          mpParentFrame( nullptr )
     {}
 
     SwAccessibleEvent_Impl( EventType eT,
-                            const SwAccessibleChild& rFrmOrObj )
-        : maFrmOrObj( rFrmOrObj ),
+                            const SwAccessibleChild& rFrameOrObj )
+        : maFrameOrObj( rFrameOrObj ),
           meType( eT ),
           mnStates( AccessibleStates::NONE ),
-          mpParentFrm( nullptr )
+          mpParentFrame( nullptr )
     {
         assert(SwAccessibleEvent_Impl::DISPOSE == meType &&
                 "wrong event constructor, DISPOSE only");
@@ -376,7 +376,7 @@ public:
     explicit SwAccessibleEvent_Impl( EventType eT )
         : meType( eT ),
           mnStates( AccessibleStates::NONE ),
-          mpParentFrm( nullptr )
+          mpParentFrame( nullptr )
     {
         assert(SwAccessibleEvent_Impl::SHAPE_SELECTION == meType &&
                 "wrong event constructor, SHAPE_SELECTION only" );
@@ -384,14 +384,14 @@ public:
 
     SwAccessibleEvent_Impl( EventType eT,
                             SwAccessibleContext *pA,
-                            const SwAccessibleChild& rFrmOrObj,
+                            const SwAccessibleChild& rFrameOrObj,
                             const SwRect& rR )
         : maOldBox( rR ),
           mxAcc( pA ),
-          maFrmOrObj( rFrmOrObj ),
+          maFrameOrObj( rFrameOrObj ),
           meType( eT ),
           mnStates( AccessibleStates::NONE ),
-          mpParentFrm( nullptr )
+          mpParentFrame( nullptr )
     {
         assert((SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
                 SwAccessibleEvent_Impl::POS_CHANGED == meType) &&
@@ -400,25 +400,25 @@ public:
 
     SwAccessibleEvent_Impl( EventType eT,
                             SwAccessibleContext *pA,
-                            const SwAccessibleChild& rFrmOrObj,
+                            const SwAccessibleChild& rFrameOrObj,
                             const AccessibleStates _nStates )
         : mxAcc( pA ),
-          maFrmOrObj( rFrmOrObj ),
+          maFrameOrObj( rFrameOrObj ),
           meType( eT ),
           mnStates( _nStates ),
-          mpParentFrm( nullptr )
+          mpParentFrame( nullptr )
     {
         assert( SwAccessibleEvent_Impl::CARET_OR_STATES == meType &&
                 "wrong event constructor, CARET_OR_STATES only" );
     }
 
-    SwAccessibleEvent_Impl( EventType eT, const SwFrm *pParentFrm,
-                const SwAccessibleChild& rFrmOrObj, const SwRect& rR ) :
+    SwAccessibleEvent_Impl( EventType eT, const SwFrame *pParentFrame,
+                const SwAccessibleChild& rFrameOrObj, const SwRect& rR ) :
         maOldBox( rR ),
-        maFrmOrObj( rFrmOrObj ),
+        maFrameOrObj( rFrameOrObj ),
         meType( eT ),
         mnStates( AccessibleStates::NONE ),
-        mpParentFrm( pParentFrm )
+        mpParentFrame( pParentFrame )
     {
         assert( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType &&
             "wrong event constructor, CHILD_POS_CHANGED only" );
@@ -453,9 +453,9 @@ public:
         maOldBox = rOldBox;
     }
 
-    inline const SwAccessibleChild& GetFrmOrObj() const
+    inline const SwAccessibleChild& GetFrameOrObj() const
     {
-        return maFrmOrObj;
+        return maFrameOrObj;
     }
 
     // <SetStates(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
@@ -530,7 +530,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
     for ( ;li != end();)
     {
         SwAccessibleEvent_Impl e = *li;
-        if (e.IsNoXaccParentFrm())
+        if (e.IsNoXaccParentFrame())
         {
             iterator liNext = li;
             ++liNext;
@@ -568,13 +568,13 @@ struct SwAccessibleChildFunc
     bool operator()( const SwAccessibleChild& r1,
                          const SwAccessibleChild& r2 ) const
     {
-        const void *p1 = r1.GetSwFrm()
-                         ? static_cast < const void * >( r1.GetSwFrm())
+        const void *p1 = r1.GetSwFrame()
+                         ? static_cast < const void * >( r1.GetSwFrame())
                          : ( r1.GetDrawObject()
                              ? static_cast < const void * >( r1.GetDrawObject() )
                              : static_cast < const void * >( r1.GetWindow() ) );
-        const void *p2 = r2.GetSwFrm()
-                         ? static_cast < const void * >( r2.GetSwFrm())
+        const void *p2 = r2.GetSwFrame()
+                         ? static_cast < const void * >( r2.GetSwFrame())
                          : ( r2.GetDrawObject()
                              ? static_cast < const void * >( r2.GetDrawObject() )
                              : static_cast < const void * >( r2.GetWindow() ) );
@@ -653,7 +653,7 @@ class SwAccPreviewData
     SwRect maVisArea;
     Fraction maScale;
 
-    const SwPageFrm *mpSelPage;
+    const SwPageFrame *mpSelPage;
 
     /** adjust logic page rectangle to its visible part
 
@@ -680,10 +680,10 @@ public:
     void Update( const SwAccessibleMap& rAccMap,
                  const std::vector<PreviewPage*>& _rPreviewPages,
                  const Fraction&  _rScale,
-                 const SwPageFrm* _pSelectedPageFrm,
+                 const SwPageFrame* _pSelectedPageFrame,
                  const Size&      _rPreviewWinSize );
 
-    void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm );
+    void InvalidateSelection( const SwPageFrame* _pSelectedPageFrame );
 
     const SwRect& GetVisArea() const { return maVisArea;}
 
@@ -694,9 +694,9 @@ public:
     void AdjustMapMode( MapMode& rMapMode,
                         const Point& rPoint ) const;
 
-    inline const SwPageFrm *GetSelPage() const { return mpSelPage; }
+    inline const SwPageFrame *GetSelPage() const { return mpSelPage; }
 
-    void DisposePage(const SwPageFrm *pPageFrm );
+    void DisposePage(const SwPageFrame *pPageFrame );
 };
 
 SwAccPreviewData::SwAccPreviewData() :
@@ -711,12 +711,12 @@ SwAccPreviewData::~SwAccPreviewData()
 void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
                                const std::vector<PreviewPage*>& _rPreviewPages,
                                const Fraction&  _rScale,
-                               const SwPageFrm* _pSelectedPageFrm,
+                               const SwPageFrame* _pSelectedPageFrame,
                                const Size&      _rPreviewWinSize )
 {
     // store preview scaling, maximal preview page size and selected page
     maScale = _rScale;
-    mpSelPage = _pSelectedPageFrm;
+    mpSelPage = _pSelectedPageFrame;
 
     // prepare loop on preview pages
     maPreviewRects.clear();
@@ -757,9 +757,9 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
     }
 }
 
-void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm )
+void SwAccPreviewData::InvalidateSelection( const SwPageFrame* _pSelectedPageFrame )
 {
-    mpSelPage = _pSelectedPageFrm;
+    mpSelPage = _pSelectedPageFrame;
     OSL_ENSURE( mpSelPage, "selected page not found" );
 }
 
@@ -797,9 +797,9 @@ void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode,
     // else: don't adjust MapMode
 }
 
-void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm )
+void SwAccPreviewData::DisposePage(const SwPageFrame *pPageFrame )
 {
-    if( mpSelPage == pPageFrm )
+    if( mpSelPage == pPageFrame )
         mpSelPage = nullptr;
 }
 
@@ -835,11 +835,11 @@ void SwAccPreviewData::AdjustLogicPgRectToVisibleArea(
 }
 
 static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
-                                  const SwFrm *pFrm )
+                                  const SwFrame *pFrame )
 {
     bool bRet = false;
 
-    if( pFrm && pFrm->IsCellFrm() && rAcc.is() )
+    if( pFrame && pFrame->IsCellFrame() && rAcc.is() )
     {
         // Is it in the same table? We check that
         // by comparing the last table frame in the
@@ -847,23 +847,23 @@ static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
         // searching the first one.
         SwAccessibleContext *pAccImpl =
             static_cast< SwAccessibleContext *>( rAcc.get() );
-        if( pAccImpl->GetFrm()->IsCellFrm() )
+        if( pAccImpl->GetFrame()->IsCellFrame() )
         {
-            const SwTabFrm *pTabFrm1 = pAccImpl->GetFrm()->FindTabFrm();
-            if (pTabFrm1)
+            const SwTabFrame *pTabFrame1 = pAccImpl->GetFrame()->FindTabFrame();
+            if (pTabFrame1)
             {
-                while (pTabFrm1->GetFollow())
-                    pTabFrm1 = pTabFrm1->GetFollow();
+                while (pTabFrame1->GetFollow())
+                    pTabFrame1 = pTabFrame1->GetFollow();
             }
 
-            const SwTabFrm *pTabFrm2 = pFrm->FindTabFrm();
-            if (pTabFrm2)
+            const SwTabFrame *pTabFrame2 = pFrame->FindTabFrame();
+            if (pTabFrame2)
             {
-                while (pTabFrm2->GetFollow())
-                    pTabFrm2 = pTabFrm2->GetFollow();
+                while (pTabFrame2->GetFollow())
+                    pTabFrame2 = pTabFrame2->GetFollow();
             }
 
-            bRet = (pTabFrm1 == pTabFrm2);
+            bRet = (pTabFrame1 == pTabFrame2);
         }
     }
 
@@ -873,11 +873,11 @@ static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
 void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
 {
     ::rtl::Reference < SwAccessibleContext > xAccImpl( rEvent.GetContext() );
-    if (!xAccImpl.is() && rEvent.mpParentFrm != nullptr)
+    if (!xAccImpl.is() && rEvent.mpParentFrame != nullptr)
     {
         SwAccessibleContextMap_Impl::iterator aIter =
-            mpFrmMap->find( rEvent.mpParentFrm );
-        if( aIter != mpFrmMap->end() )
+            mpFrameMap->find( rEvent.mpParentFrame );
+        if( aIter != mpFrameMap->end() )
         {
             uno::Reference < XAccessible > xAcc( (*aIter).second );
             if (xAcc.is())
@@ -894,7 +894,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
     {
         DoInvalidateShapeSelection();
     }
-    else if( xAccImpl.is() && xAccImpl->GetFrm() )
+    else if( xAccImpl.is() && xAccImpl->GetFrame() )
     {
         if ( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE &&
              rEvent.IsInvalidateTextAttrs() )
@@ -910,7 +910,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
             xAccImpl->InvalidatePosOrSize( rEvent.GetOldBox() );
             break;
         case SwAccessibleEvent_Impl::CHILD_POS_CHANGED:
-            xAccImpl->InvalidateChildPosOrSize( rEvent.GetFrmOrObj(),
+            xAccImpl->InvalidateChildPosOrSize( rEvent.GetFrameOrObj(),
                                        rEvent.GetOldBox() );
             break;
         case SwAccessibleEvent_Impl::DISPOSE:
@@ -974,7 +974,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
     {
 
         SwAccessibleEventMap_Impl::iterator aIter =
-                                        mpEventMap->find( rEvent.GetFrmOrObj() );
+                                        mpEventMap->find( rEvent.GetFrameOrObj() );
         if( aIter != mpEventMap->end() )
         {
             SwAccessibleEvent_Impl aEvent( *(*aIter).second );
@@ -1059,7 +1059,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
         }
         else if( SwAccessibleEvent_Impl::DISPOSE != rEvent.GetType() )
         {
-            SwAccessibleEventMap_Impl::value_type aEntry( rEvent.GetFrmOrObj(),
+            SwAccessibleEventMap_Impl::value_type aEntry( rEvent.GetFrameOrObj(),
                     mpEvents->insert( mpEvents->end(), rEvent ) );
             mpEventMap->insert( aEntry );
         }
@@ -1072,12 +1072,12 @@ void SwAccessibleMap::InvalidateCursorPosition(
     SwAccessibleContext *pAccImpl =
         static_cast< SwAccessibleContext *>( rAcc.get() );
     OSL_ENSURE( pAccImpl, "no caret context" );
-    OSL_ENSURE( pAccImpl->GetFrm(), "caret context is disposed" );
+    OSL_ENSURE( pAccImpl->GetFrame(), "caret context is disposed" );
     if( GetShell()->ActionPend() )
     {
         SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
                                        pAccImpl,
-                                       SwAccessibleChild(pAccImpl->GetFrm()),
+                                       SwAccessibleChild(pAccImpl->GetFrame()),
                                        AccessibleStates::CARET );
         AppendEvent( aEvent );
     }
@@ -1088,7 +1088,7 @@ void SwAccessibleMap::InvalidateCursorPosition(
         // been disposed because it moved out of the vis area.
         // Setting the cursor for such frames is useless and even
         // causes asserts.
-        if( pAccImpl->GetFrm() )
+        if( pAccImpl->GetFrame() )
             pAccImpl->InvalidateCursorPos();
     }
 }
@@ -1121,7 +1121,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
     const SwViewShell *pVSh = GetShell();
     const SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pVSh) !=  nullptr ?
                             static_cast< const SwFEShell * >( pVSh ) : nullptr;
-    SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( false /* ??? */ ) : nullptr;
+    SwPaM* pCursor = pFESh ? pFESh->GetCursor( false /* ??? */ ) : nullptr;
 
     //const size_t nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
 
@@ -1155,7 +1155,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
         {
             while( aIter != aEndIter )
             {
-                SwAccessibleChild pFrm( (*aIter).first );
+                SwAccessibleChild pFrame( (*aIter).first );
 
                 const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr;
                 if( !pFrameFormat )
@@ -1185,21 +1185,21 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                 {
                     int pIndex = pPos->nContent.GetIndex();
                     bool bMarked = false;
-                    if( pCrsr != nullptr )
+                    if( pCursor != nullptr )
                     {
                         const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
                         sal_uLong nHere = pNode->GetIndex();
 
-                        for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+                        for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
                         {
                             // ignore, if no mark
-                            if( rTmpCrsr.HasMark() )
+                            if( rTmpCursor.HasMark() )
                             {
                                 bMarked = true;
-                                // check whether nHere is 'inside' pCrsr
-                                SwPosition* pStart = rTmpCrsr.Start();
+                                // check whether nHere is 'inside' pCursor
+                                SwPosition* pStart = rTmpCursor.Start();
                                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                                SwPosition* pEnd = rTmpCrsr.End();
+                                SwPosition* pEnd = rTmpCursor.End();
                                 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                                 if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex)  )
                                 {
@@ -1264,25 +1264,25 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
 
     delete[] pShapes;
 
-    //Checked for FlyFrm
-    if (mpFrmMap)
+    //Checked for FlyFrame
+    if (mpFrameMap)
     {
-        SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
-        while( aIter != mpFrmMap->end() )
+        SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+        while( aIter != mpFrameMap->end() )
         {
-            const SwFrm *pFrm = (*aIter).first;
-            if(pFrm->IsFlyFrm())
+            const SwFrame *pFrame = (*aIter).first;
+            if(pFrame->IsFlyFrame())
             {
                 uno::Reference < XAccessible > xAcc = (*aIter).second;
 
                 if(xAcc.is())
                 {
                     SwAccessibleFrameBase *pAccFrame = (static_cast< SwAccessibleFrameBase * >(xAcc.get()));
-                    bool bFrmChanged = pAccFrame->SetSelectedState( true );
-                    if (bFrmChanged)
+                    bool bFrameChanged = pAccFrame->SetSelectedState( true );
+                    if (bFrameChanged)
                     {
-                        const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
-                        const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                        const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( pFrame );
+                        const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
                         if (pFrameFormat)
                         {
                             const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
@@ -1320,33 +1320,33 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
     //Checked for Paras.
     bool bMarkChanged = false;
     SwAccessibleContextMap_Impl mapTemp;
-    if( pCrsr != nullptr )
+    if( pCursor != nullptr )
     {
-        for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+        for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
         {
-            if( rTmpCrsr.HasMark() )
+            if( rTmpCursor.HasMark() )
             {
-                SwNodeIndex nStartIndex( rTmpCrsr.Start()->nNode );
-                SwNodeIndex nEndIndex( rTmpCrsr.End()->nNode );
+                SwNodeIndex nStartIndex( rTmpCursor.Start()->nNode );
+                SwNodeIndex nEndIndex( rTmpCursor.End()->nNode );
                 while(nStartIndex <= nEndIndex)
                 {
-                    SwFrm *pFrm = nullptr;
+                    SwFrame *pFrame = nullptr;
                     if(nStartIndex.GetNode().IsContentNode())
                     {
                         SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode()));
-                        pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First();
+                        pFrame = SwIterator<SwFrame, SwContentNode>(*pCNd).First();
                     }
                     else if( nStartIndex.GetNode().IsTableNode() )
                     {
                         SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode()));
                         SwTableFormat* pFormat = pTable->GetTable().GetFrameFormat();
-                        pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First();
+                        pFrame = SwIterator<SwFrame, SwTableFormat>(*pFormat).First();
                     }
 
-                    if( pFrm && mpFrmMap)
+                    if( pFrame && mpFrameMap)
                     {
-                        SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pFrm );
-                        if( aIter != mpFrmMap->end() )
+                        SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pFrame );
+                        if( aIter != mpFrameMap->end() )
                         {
                             uno::Reference < XAccessible > xAcc = (*aIter).second;
                             bool isChanged = false;
@@ -1356,9 +1356,9 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                             }
                             if(!isChanged)
                             {
-                                SwAccessibleContextMap_Impl::iterator aEraseIter = mpSeletedFrmMap->find( pFrm );
-                                if(aEraseIter != mpSeletedFrmMap->end())
-                                    mpSeletedFrmMap->erase(aEraseIter);
+                                SwAccessibleContextMap_Impl::iterator aEraseIter = mpSeletedFrameMap->find( pFrame );
+                                if(aEraseIter != mpSeletedFrameMap->end())
+                                    mpSeletedFrameMap->erase(aEraseIter);
                             }
                             else
                             {
@@ -1366,7 +1366,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
                                 vecAdd.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
                             }
 
-                            mapTemp.insert( SwAccessibleContextMap_Impl::value_type( pFrm, xAcc ) );
+                            mapTemp.insert( SwAccessibleContextMap_Impl::value_type( pFrame, xAcc ) );
                         }
                     }
                     ++nStartIndex;
@@ -1374,12 +1374,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
             }
         }
     }
-    if( !mpSeletedFrmMap )
-        mpSeletedFrmMap = new SwAccessibleContextMap_Impl;
-    if( !mpSeletedFrmMap->empty() )
+    if( !mpSeletedFrameMap )
+        mpSeletedFrameMap = new SwAccessibleContextMap_Impl;
+    if( !mpSeletedFrameMap->empty() )
     {
-        SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrmMap->begin();
-        while( aIter != mpSeletedFrmMap->end() )
+        SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrameMap->begin();
+        while( aIter != mpSeletedFrameMap->end() )
         {
             uno::Reference < XAccessible > xAcc = (*aIter).second;
             if(xAcc.is())
@@ -1388,7 +1388,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
             vecRemove.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
         }
         bMarkChanged = true;
-        mpSeletedFrmMap->clear();
+        mpSeletedFrameMap->clear();
     }
 
     if( !mapTemp.empty() )
@@ -1396,12 +1396,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
         SwAccessibleContextMap_Impl::iterator aIter = mapTemp.begin();
         while( aIter != mapTemp.end() )
         {
-            mpSeletedFrmMap->insert( SwAccessibleContextMap_Impl::value_type( (*aIter).first, (*aIter).second ) );
+            mpSeletedFrameMap->insert( SwAccessibleContextMap_Impl::value_type( (*aIter).first, (*aIter).second ) );
             ++aIter;
         }
         mapTemp.clear();
     }
-    if( bMarkChanged && mpFrmMap)
+    if( bMarkChanged && mpFrameMap)
     {
         VEC_PARA::iterator vi = vecAdd.begin();
         for (; vi != vecAdd.end() ; ++vi)
@@ -1647,7 +1647,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
 */
 
 SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
-    mpFrmMap( nullptr ),
+    mpFrameMap( nullptr ),
     mpShapeMap( nullptr ),
     mpShapes( nullptr ),
     mpEvents( nullptr ),
@@ -1657,7 +1657,7 @@ SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
     mpPreview( nullptr ),
     mnPara( 1 ),
     mbShapeSelected( false ),
-    mpSeletedFrmMap(nullptr)
+    mpSeletedFrameMap(nullptr)
 {
     pSh->GetLayout()->AddAccessibleShell();
 }
@@ -1667,11 +1667,11 @@ SwAccessibleMap::~SwAccessibleMap()
     uno::Reference < XAccessible > xAcc;
     {
         osl::MutexGuard aGuard( maMutex );
-        if( mpFrmMap )
+        if( mpFrameMap )
         {
-            const SwRootFrm *pRootFrm = GetShell()->GetLayout();
-            SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pRootFrm );
-            if( aIter != mpFrmMap->end() )
+            const SwRootFrame *pRootFrame = GetShell()->GetLayout();
+            SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pRootFrame );
+            if( aIter != mpFrameMap->end() )
                 xAcc = (*aIter).second;
             if( !xAcc.is() )
                 xAcc = new SwAccessibleDocument( this );
@@ -1683,10 +1683,10 @@ SwAccessibleMap::~SwAccessibleMap()
         SwAccessibleDocument *pAcc = static_cast< SwAccessibleDocument * >( xAcc.get() );
         pAcc->Dispose( true );
     }
-    if( mpFrmMap )
+    if( mpFrameMap )
     {
-        SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
-        while( aIter != mpFrmMap->end() )
+        SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+        while( aIter != mpFrameMap->end() )
         {
             uno::Reference < XAccessible > xTmp = (*aIter).second;
             if( xTmp.is() )
@@ -1700,12 +1700,12 @@ SwAccessibleMap::~SwAccessibleMap()
     {
         osl::MutexGuard aGuard( maMutex );
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( !mpFrmMap || mpFrmMap->empty(),
+        OSL_ENSURE( !mpFrameMap || mpFrameMap->empty(),
                 "Frame map should be empty after disposing the root frame" );
-        if( mpFrmMap )
+        if( mpFrameMap )
         {
-            SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
-            while( aIter != mpFrmMap->end() )
+            SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+            while( aIter != mpFrameMap->end() )
             {
                 uno::Reference < XAccessible > xTmp = (*aIter).second;
                 if( xTmp.is() )
@@ -1735,8 +1735,8 @@ SwAccessibleMap::~SwAccessibleMap()
             }
         }
 #endif
-        delete mpFrmMap;
-        mpFrmMap = nullptr;
+        delete mpFrameMap;
+        mpFrameMap = nullptr;
         delete mpShapeMap;
         mpShapeMap = nullptr;
         delete mpShapes;
@@ -1775,7 +1775,7 @@ SwAccessibleMap::~SwAccessibleMap()
         mpEvents = nullptr;
     }
     mpVSh->GetLayout()->RemoveAccessibleShell();
-    delete mpSeletedFrmMap;
+    delete mpSeletedFrameMap;
 }
 
 uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
@@ -1787,22 +1787,22 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
     {
         osl::MutexGuard aGuard( maMutex );
 
-        if( !mpFrmMap )
+        if( !mpFrameMap )
         {
-            mpFrmMap = new SwAccessibleContextMap_Impl;
+            mpFrameMap = new SwAccessibleContextMap_Impl;
 #if OSL_DEBUG_LEVEL > 0
-            mpFrmMap->mbLocked = false;
+            mpFrameMap->mbLocked = false;
 #endif
         }
 
 #if OSL_DEBUG_LEVEL > 0
-        OSL_ENSURE( !mpFrmMap->mbLocked, "Map is locked" );
-        mpFrmMap->mbLocked = true;
+        OSL_ENSURE( !mpFrameMap->mbLocked, "Map is locked" );
+        mpFrameMap->mbLocked = true;
 #endif
 
-        const SwRootFrm *pRootFrm = GetShell()->GetLayout();
-        SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pRootFrm );
-        if( aIter != mpFrmMap->end() )
+        const SwRootFrame *pRootFrame = GetShell()->GetLayout();
+        SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pRootFrame );
+        if( aIter != mpFrameMap->end() )
             xAcc = (*aIter).second;
         if( xAcc.is() )
         {
@@ -1815,19 +1815,19 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
             else
                 xAcc = new SwAccessibleDocument( this );
 
-            if( aIter != mpFrmMap->end() )
+            if( aIter != mpFrameMap->end() )
             {
                 (*aIter).second = xAcc;
             }
             else
             {
-                SwAccessibleContextMap_Impl::value_type aEntry( pRootFrm, xAcc );
-                mpFrmMap->insert( aEntry );
+                SwAccessibleContextMap_Impl::value_type aEntry( pRootFrame, xAcc );
+                mpFrameMap->insert( aEntry );
             }
         }
 
 #if OSL_DEBUG_LEVEL > 0
-        mpFrmMap->mbLocked = false;
+        mpFrameMap->mbLocked = false;
 #endif
     }
 
@@ -1849,19 +1849,19 @@ uno::Reference< XAccessible > SwAccessibleMap::GetDocumentView( )
 uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview(
                                     const std::vector<PreviewPage*>& _rPreviewPages,
                                     const Fraction&  _rScale,
-                                    const SwPageFrm* _pSelectedPageFrm,
+                                    const SwPageFrame* _pSelectedPageFrame,
                                     const Size&      _rPreviewWinSize )
 {
     // create & update preview data object
     if( mpPreview == nullptr )
         mpPreview = new SwAccPreviewData();
-    mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrm, _rPreviewWinSize );
+    mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrame, _rPreviewWinSize );
 
     uno::Reference<XAccessible> xAcc = _GetDocumentView( true );
     return xAcc;
 }
 
-uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
+uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrame *pFrame,
                                                      bool bCreate )
 {
     uno::Reference < XAccessible > xAcc;
@@ -1871,73 +1871,73 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
     {
         osl::MutexGuard aGuard( maMutex );
 
-        if( !mpFrmMap && bCreate )
-            mpFrmMap = new SwAccessibleContextMap_Impl;
-        if( mpFrmMap )
+        if( !mpFrameMap && bCreate )
+            mpFrameMap = new SwAccessibleContextMap_Impl;
+        if( mpFrameMap )
         {
-            SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pFrm );
-            if( aIter != mpFrmMap->end() )
+            SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pFrame );
+            if( aIter != mpFrameMap->end() )
                 xAcc = (*aIter).second;
 
             if( !xAcc.is() && bCreate )
             {
                 SwAccessibleContext *pAcc = nullptr;
-                switch( pFrm->GetType() )
+                switch( pFrame->GetType() )
                 {
                 case FRM_TXT:
                     mnPara++;
                     pAcc = new SwAccessibleParagraph( *this,
-                                    static_cast< const SwTextFrm& >( *pFrm ) );
+                                    static_cast< const SwTextFrame& >( *pFrame ) );
                     break;
                 case FRM_HEADER:
                     pAcc = new SwAccessibleHeaderFooter( this,
-                                    static_cast< const SwHeaderFrm *>( pFrm ) );
+                                    static_cast< const SwHeaderFrame *>( pFrame ) );
                     break;
                 case FRM_FOOTER:
                     pAcc = new SwAccessibleHeaderFooter( this,
-                                    static_cast< const SwFooterFrm *>( pFrm ) );
+                                    static_cast< const SwFooterFrame *>( pFrame ) );
                     break;
                 case FRM_FTN:
                     {
-                        const SwFootnoteFrm *pFootnoteFrm =
-                            static_cast < const SwFootnoteFrm * >( pFrm );
+                        const SwFootnoteFrame *pFootnoteFrame =
+                            static_cast < const SwFootnoteFrame * >( pFrame );
                         bool bIsEndnote =
-                            SwAccessibleFootnote::IsEndnote( pFootnoteFrm );
+                            SwAccessibleFootnote::IsEndnote( pFootnoteFrame );
                         pAcc = new SwAccessibleFootnote( this, bIsEndnote,
                                     /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
-                                    pFootnoteFrm );
+                                    pFootnoteFrame );
                     }
                     break;
                 case FRM_FLY:
                     {
-                        const SwFlyFrm *pFlyFrm =
-                            static_cast < const SwFlyFrm * >( pFrm );
-                        switch( SwAccessibleFrameBase::GetNodeType( pFlyFrm ) )
+                        const SwFlyFrame *pFlyFrame =
+                            static_cast < const SwFlyFrame * >( pFrame );
+                        switch( SwAccessibleFrameBase::GetNodeType( pFlyFrame ) )
                         {
                         case ND_GRFNODE:
-                            pAcc = new SwAccessibleGraphic( this, pFlyFrm );
+                            pAcc = new SwAccessibleGraphic( this, pFlyFrame );
                             break;
                         case ND_OLENODE:
-                            pAcc = new SwAccessibleEmbeddedObject( this, pFlyFrm );
+                            pAcc = new SwAccessibleEmbeddedObject( this, pFlyFrame );
                             break;
                         default:
-                            pAcc = new SwAccessibleTextFrame( this, *pFlyFrm );
+                            pAcc = new SwAccessibleTextFrame( this, *pFlyFrame );
                             break;
                         }
                     }
                     break;
                 case FRM_CELL:
                     pAcc = new SwAccessibleCell( this,
-                                    static_cast< const SwCellFrm *>( pFrm ) );
+                                    static_cast< const SwCellFrame *>( pFrame ) );
                     break;
                 case FRM_TAB:
                     pAcc = new SwAccessibleTable( this,
-                                    static_cast< const SwTabFrm *>( pFrm ) );
+                                    static_cast< const SwTabFrame *>( pFrame ) );
                     break;
                 case FRM_PAGE:
                     OSL_ENSURE( GetShell()->IsPreview(),
                                 "accessible page frames only in PagePreview" );
-                    pAcc = new SwAccessiblePage( this, pFrm );
+                    pAcc = new SwAccessiblePage( this, pFrame );
                     break;
                 }
                 xAcc = pAcc;
@@ -1945,18 +1945,18 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
                 OSL_ENSURE( xAcc.is(), "unknown frame type" );
                 if( xAcc.is() )
                 {
-                    if( aIter != mpFrmMap->end() )
+                    if( aIter != mpFrameMap->end() )
                     {
                         (*aIter).second = xAcc;
                     }
                     else
                     {
-                        SwAccessibleContextMap_Impl::value_type aEntry( pFrm, xAcc );
-                        mpFrmMap->insert( aEntry );
+                        SwAccessibleContextMap_Impl::value_type aEntry( pFrame, xAcc );
+                        mpFrameMap->insert( aEntry );
                     }
 
                     if( pAcc->HasCursor() &&
-                        !AreInSameTable( mxCursorContext, pFrm ) )
+                        !AreInSameTable( mxCursorContext, pFrame ) )
                     {
                         // If the new context has the focus, and if we know
                         // another context that had the focus, then the focus
@@ -1993,10 +1993,10 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
 }
 
 ::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
-            const SwFrm *pFrm,
+            const SwFrame *pFrame,
             bool bCreate )
 {
-    uno::Reference < XAccessible > xAcc( GetContext( pFrm, bCreate ) );
+    uno::Reference < XAccessible > xAcc( GetContext( pFrame, bCreate ) );
 
     ::rtl::Reference < SwAccessibleContext > xAccImpl(
          static_cast< SwAccessibleContext * >( xAcc.get() ) );
@@ -2182,17 +2182,17 @@ void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Referenc
     return xAccImpl;
 }
 
-void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
+void SwAccessibleMap::RemoveContext( const SwFrame *pFrame )
 {
     osl::MutexGuard aGuard( maMutex );
 
-    if( mpFrmMap )
+    if( mpFrameMap )
     {
         SwAccessibleContextMap_Impl::iterator aIter =
-            mpFrmMap->find( pFrm );
-        if( aIter != mpFrmMap->end() )
+            mpFrameMap->find( pFrame );
+        if( aIter != mpFrameMap->end() )
         {
-            mpFrmMap->erase( aIter );
+            mpFrameMap->erase( aIter );
 
             // Remove reference to old caret object. Though mxCursorContext
             // is a weak reference and cleared automatically, clearing it
@@ -2202,18 +2202,18 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
             {
                 SwAccessibleContext *pOldAccImpl =
                     static_cast< SwAccessibleContext *>( xOldAcc.get() );
-                OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" );
-                if( pOldAccImpl->GetFrm() == pFrm )
+                OSL_ENSURE( pOldAccImpl->GetFrame(), "old caret context is disposed" );
+                if( pOldAccImpl->GetFrame() == pFrame )
                 {
                     xOldAcc.clear();    // get an empty ref
                     mxCursorContext = xOldAcc;
                 }
             }
 
-            if( mpFrmMap->empty() )
+            if( mpFrameMap->empty() )
             {
-                delete mpFrmMap;
-                mpFrmMap = nullptr;
+                delete mpFrameMap;
+                mpFrameMap = nullptr;
             }
         }
     }
@@ -2244,23 +2244,23 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
     }
 }
 
-void SwAccessibleMap::Dispose( const SwFrm *pFrm,
+void SwAccessibleMap::Dispose( const SwFrame *pFrame,
                                const SdrObject *pObj,
                                vcl::Window* pWindow,
                                bool bRecursive )
 {
-    SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
+    SwAccessibleChild aFrameOrObj( pFrame, pObj, pWindow );
 
     // Indeed, the following assert checks the frame's accessible flag,
     // because that's the one that is evaluated in the layout. The frame
     // might not be accessible anyway. That's the case for cell frames that
     // contain further cells.
-    OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
+    OSL_ENSURE( !aFrameOrObj.GetSwFrame() || aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
             "non accessible frame should be disposed" );
 
-    if (aFrmOrObj.IsAccessible( GetShell()->IsPreview() )
+    if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
             // fdo#87199 dispose the darn thing if it ever was accessible
-        || (pFrm && mpFrmMap && mpFrmMap->find(pFrm) != mpFrmMap->end()))
+        || (pFrame && mpFrameMap && mpFrameMap->find(pFrame) != mpFrameMap->end()))
     {
         ::rtl::Reference< SwAccessibleContext > xAccImpl;
         ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
@@ -2270,28 +2270,28 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
             osl::MutexGuard aGuard( maMutex );
 
             // First of all look for an accessible context for a frame
-            if( aFrmOrObj.GetSwFrm() && mpFrmMap )
+            if( aFrameOrObj.GetSwFrame() && mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                    mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                    mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                 {
                     uno::Reference < XAccessible > xAcc( (*aIter).second );
                     xAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
                 }
             }
-            if( !xAccImpl.is() && mpFrmMap )
+            if( !xAccImpl.is() && mpFrameMap )
             {
                 // If there is none, look if the parent is accessible.
-                const SwFrm *pParent =
-                        SwAccessibleFrame::GetParent( aFrmOrObj,
+                const SwFrame *pParent =
+                        SwAccessibleFrame::GetParent( aFrameOrObj,
                                                       GetShell()->IsPreview());
 
                 if( pParent )
                 {
                     SwAccessibleContextMap_Impl::iterator aIter =
-                        mpFrmMap->find( pParent );
-                    if( aIter != mpFrmMap->end() )
+                        mpFrameMap->find( pParent );
+                    if( aIter != mpFrameMap->end() )
                     {
                         uno::Reference < XAccessible > xAcc( (*aIter).second );
                         xParentAccImpl =
@@ -2299,10 +2299,10 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
                     }
                 }
             }
-            if( !xParentAccImpl.is() && !aFrmOrObj.GetSwFrm() && mpShapeMap )
+            if( !xParentAccImpl.is() && !aFrameOrObj.GetSwFrame() && mpShapeMap )
             {
                 SwAccessibleShapeMap_Impl::iterator aIter =
-                    mpShapeMap->find( aFrmOrObj.GetDrawObject() );
+                    mpShapeMap->find( aFrameOrObj.GetDrawObject() );
                 if( aIter != mpShapeMap->end() )
                 {
                     uno::Reference < XAccessible > xAcc( (*aIter).second );
@@ -2333,11 +2333,11 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
             if( mpEvents )
             {
                 SwAccessibleEventMap_Impl::iterator aIter =
-                    mpEventMap->find( aFrmOrObj );
+                    mpEventMap->find( aFrameOrObj );
                 if( aIter != mpEventMap->end() )
                 {
                     SwAccessibleEvent_Impl aEvent(
-                            SwAccessibleEvent_Impl::DISPOSE, aFrmOrObj );
+                            SwAccessibleEvent_Impl::DISPOSE, aFrameOrObj );
                     AppendEvent( aEvent );
                 }
             }
@@ -2358,40 +2358,40 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
             // be broadcasted at the end of the action to give the table
             // a chance to generate a single table change event.
 
-            xParentAccImpl->DisposeChild( aFrmOrObj, bRecursive );
+            xParentAccImpl->DisposeChild( aFrameOrObj, bRecursive );
         }
         else if( xShapeAccImpl.is() )
         {
-            RemoveContext( aFrmOrObj.GetDrawObject() );
+            RemoveContext( aFrameOrObj.GetDrawObject() );
             xShapeAccImpl->dispose();
         }
 
-        if( mpPreview && pFrm && pFrm->IsPageFrm() )
-            mpPreview->DisposePage( static_cast< const SwPageFrm *>( pFrm ) );
+        if( mpPreview && pFrame && pFrame->IsPageFrame() )
+            mpPreview->DisposePage( static_cast< const SwPageFrame *>( pFrame ) );
     }
 }
 
-void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
+void SwAccessibleMap::InvalidatePosOrSize( const SwFrame *pFrame,
                                            const SdrObject *pObj,
                                            vcl::Window* pWindow,
                                            const SwRect& rOldBox )
 {
-    SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( pFrame, pObj, pWindow );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         ::rtl::Reference< SwAccessibleContext > xAccImpl;
         ::rtl::Reference< SwAccessibleContext > xParentAccImpl;
-        const SwFrm *pParent =nullptr;
+        const SwFrame *pParent =nullptr;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
-                if( aFrmOrObj.GetSwFrm() )
+                if( aFrameOrObj.GetSwFrame() )
                 {
                     SwAccessibleContextMap_Impl::iterator aIter =
-                        mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                    if( aIter != mpFrmMap->end() )
+                        mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                    if( aIter != mpFrameMap->end() )
                     {
                         // If there is an accessible object already it is
                         // notified directly.
@@ -2405,14 +2405,14 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
                     // Otherwise we look if the parent is accessible.
                     // If not, there is nothing to do.
                     pParent =
-                        SwAccessibleFrame::GetParent( aFrmOrObj,
+                        SwAccessibleFrame::GetParent( aFrameOrObj,
                                                       GetShell()->IsPreview());
 
                     if( pParent )
                     {
                         SwAccessibleContextMap_Impl::iterator aIter =
-                            mpFrmMap->find( pParent );
-                        if( aIter != mpFrmMap->end() )
+                            mpFrameMap->find( pParent );
+                        if( aIter != mpFrameMap->end() )
                         {
                             uno::Reference < XAccessible > xAcc( (*aIter).second );
                             xParentAccImpl =
@@ -2429,7 +2429,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
             {
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.get(),
-                    aFrmOrObj, rOldBox );
+                    aFrameOrObj, rOldBox );
                 AppendEvent( aEvent );
             }
             else
@@ -2444,13 +2444,13 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
             {
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
-                    xParentAccImpl.get(), aFrmOrObj, rOldBox );
+                    xParentAccImpl.get(), aFrameOrObj, rOldBox );
                 AppendEvent( aEvent );
             }
             else
             {
                 FireEvents();
-                xParentAccImpl->InvalidateChildPosOrSize( aFrmOrObj,
+                xParentAccImpl->InvalidateChildPosOrSize( aFrameOrObj,
                                                           rOldBox );
             }
         }
@@ -2459,19 +2459,19 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
 /*
 For child graphic and its parent paragraph,if split 2 graphic to 2 paragraph,
 will delete one graphic swfrm and new create 1 graphic swfrm ,
-then the new paragraph and the new graphic SwFrm will add .
-but when add graphic SwFrm ,the accessible of the new Paragraph is not created yet.
+then the new paragraph and the new graphic SwFrame will add .
+but when add graphic SwFrame ,the accessible of the new Paragraph is not created yet.
 so the new graphic accessible 'parent is NULL,
-so run here: save the parent's SwFrm not the accessible object parent,
+so run here: save the parent's SwFrame not the accessible object parent,
 */
-            bool bIsValidFrm = false;
+            bool bIsValidFrame = false;
             bool bIsTextParent = false;
-            if (aFrmOrObj.GetSwFrm())
+            if (aFrameOrObj.GetSwFrame())
             {
-                int nType = pFrm->GetType();
+                int nType = pFrame->GetType();
                 if ( FRM_FLY == nType )
                 {
-                    bIsValidFrm =true;
+                    bIsValidFrame =true;
                 }
             }
             else if(pObj)
@@ -2482,15 +2482,15 @@ so run here: save the parent's SwFrm not the accessible object parent,
                     bIsTextParent =true;
                 }
             }
-//          bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
-//          bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
-            if((bIsValidFrm || bIsTextParent) )
+//          bool bIsVisibleChildrenOnly =aFrameOrObj.IsVisibleChildrenOnly() ;
+//          bool bIsBoundAsChar =aFrameOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
+            if((bIsValidFrame || bIsTextParent) )
             {
                 if( GetShell()->ActionPend() )
                 {
                     SwAccessibleEvent_Impl aEvent(
                         SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
-                        pParent, aFrmOrObj, rOldBox );
+                        pParent, aFrameOrObj, rOldBox );
                     AppendEvent( aEvent );
                 }
                 else
@@ -2502,20 +2502,20 @@ so run here: save the parent's SwFrm not the accessible object parent,
     }
 }
 
-void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
+void SwAccessibleMap::InvalidateContent( const SwFrame *pFrame )
 {
-    SwAccessibleChild aFrmOrObj( pFrm );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( pFrame );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                    mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                    mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                     xAcc = (*aIter).second;
             }
         }
@@ -2528,7 +2528,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
             {
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::INVALID_CONTENT, pAccImpl,
-                    aFrmOrObj );
+                    aFrameOrObj );
                 AppendEvent( aEvent );
             }
             else
@@ -2540,20 +2540,20 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
+void SwAccessibleMap::InvalidateAttr( const SwTextFrame& rTextFrame )
 {
-    SwAccessibleChild aFrmOrObj( &rTextFrm );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( &rTextFrame );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                    mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                    mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                     xAcc = (*aIter).second;
             }
         }
@@ -2565,7 +2565,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
             if( GetShell()->ActionPend() )
             {
                 SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::INVALID_ATTR,
-                                               pAccImpl, aFrmOrObj );
+                                               pAccImpl, aFrameOrObj );
                 aEvent.SetStates( AccessibleStates::TEXT_ATTRIBUTE_CHANGED );
                 AppendEvent( aEvent );
             }
@@ -2578,38 +2578,38 @@ void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
     }
 }
 
-void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
+void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
 {
-    SwAccessibleChild aFrmOrObj( pFrm );
+    SwAccessibleChild aFrameOrObj( pFrame );
     bool bShapeSelected = false;
     const SwViewShell *pVSh = GetShell();
-    if( dynamic_cast<const SwCrsrShell*>( pVSh) !=  nullptr )
+    if( dynamic_cast<const SwCursorShell*>( pVSh) !=  nullptr )
     {
-        const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
+        const SwCursorShell *pCSh = static_cast< const SwCursorShell * >( pVSh );
         if( pCSh->IsTableMode() )
         {
-            while( aFrmOrObj.GetSwFrm() && !aFrmOrObj.GetSwFrm()->IsCellFrm() )
-                aFrmOrObj = aFrmOrObj.GetSwFrm()->GetUpper();
+            while( aFrameOrObj.GetSwFrame() && !aFrameOrObj.GetSwFrame()->IsCellFrame() )
+                aFrameOrObj = aFrameOrObj.GetSwFrame()->GetUpper();
         }
         else if( dynamic_cast<const SwFEShell*>( pVSh) !=  nullptr )
         {
             const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
-            const SwFrm *pFlyFrm = pFESh->GetSelectedFlyFrm();
-            if( pFlyFrm )
+            const SwFrame *pFlyFrame = pFESh->GetSelectedFlyFrame();
+            if( pFlyFrame )
             {
-                OSL_ENSURE( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
+                OSL_ENSURE( !pFrame || pFrame->FindFlyFrame() == pFlyFrame,
                         "cursor is not contained in fly frame" );
-                aFrmOrObj = pFlyFrm;
+                aFrameOrObj = pFlyFrame;
             }
             else if( pFESh->IsObjSelected() > 0 )
             {
                 bShapeSelected = true;
-                aFrmOrObj = static_cast<const SwFrm *>( nullptr );
+                aFrameOrObj = static_cast<const SwFrame *>( nullptr );
             }
         }
     }
 
-    OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreview()),
+    OSL_ENSURE( bShapeSelected || aFrameOrObj.IsAccessible(GetShell()->IsPreview()),
             "frame is not accessible" );
 
     uno::Reference < XAccessible > xOldAcc;
@@ -2625,27 +2625,27 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
         bOldShapeSelected = mbShapeSelected;
         mbShapeSelected = bShapeSelected;
 
-        if( aFrmOrObj.GetSwFrm() && mpFrmMap )
+        if( aFrameOrObj.GetSwFrame() && mpFrameMap )
         {
             SwAccessibleContextMap_Impl::iterator aIter =
-                mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-            if( aIter != mpFrmMap->end() )
+                mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+            if( aIter != mpFrameMap->end() )
                 xAcc = (*aIter).second;
             else
             {
                 SwRect rcEmpty;
-                const SwTabFrm* pTabFrm = aFrmOrObj.GetSwFrm()->FindTabFrm();
-                if (pTabFrm)
+                const SwTabFrame* pTabFrame = aFrameOrObj.GetSwFrame()->FindTabFrame();
+                if (pTabFrame)
                 {
-                    InvalidatePosOrSize(pTabFrm, nullptr, nullptr, rcEmpty);
+                    InvalidatePosOrSize(pTabFrame, nullptr, nullptr, rcEmpty);
                 }
                 else
                 {
-                    InvalidatePosOrSize(aFrmOrObj.GetSwFrm(), nullptr, nullptr, rcEmpty);
+                    InvalidatePosOrSize(aFrameOrObj.GetSwFrame(), nullptr, nullptr, rcEmpty);
                 }
 
-                aIter = mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                aIter = mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                 {
                     xAcc = (*aIter).second;
                 }
@@ -2664,10 +2664,10 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
             // table, its the best choice, because using it avoids
             // an unnecessary cursor invalidation cycle when creating
             // a new object for the current cell.
-            if( aFrmOrObj.GetSwFrm()->IsCellFrm() )
+            if( aFrameOrObj.GetSwFrame()->IsCellFrame() )
             {
                 if( xOldAcc.is() &&
-                    AreInSameTable( xOldAcc, aFrmOrObj.GetSwFrm() ) )
+                    AreInSameTable( xOldAcc, aFrameOrObj.GetSwFrame() ) )
                 {
                     if( xAcc.is() )
                         xOldAcc = xAcc; // avoid extra invalidation
@@ -2675,7 +2675,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                         xAcc = xOldAcc; // make sure ate least one
                 }
                 if( !xAcc.is() )
-                    xAcc = GetContext( aFrmOrObj.GetSwFrm() );
+                    xAcc = GetContext( aFrameOrObj.GetSwFrame() );
             }
         }
         else if (bShapeSelected)
@@ -2694,19 +2694,19 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                     }
                     if (pObj != nullptr)
                     {
-                        const SwFrm *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
+                        const SwFrame *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
                         if( pParent )
                         {
                             ::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,false);
                             if (!xParentAccImpl.is())
                             {
-                                const SwTabFrm* pTabFrm = pParent->FindTabFrm();
-                                if (pTabFrm)
+                                const SwTabFrame* pTabFrame = pParent->FindTabFrame();
+                                if (pTabFrame)
                                 {
                                     //The Table should not add in acc.because the "pParent" is not add to acc .
-                                    uno::Reference< XAccessible>  xAccParentTab = GetContext(pTabFrm);//Should Create.
+                                    uno::Reference< XAccessible>  xAccParentTab = GetContext(pTabFrame);//Should Create.
 
-                                    const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrm), GetShell()->IsPreview() );
+                                    const SwFrame *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrame), GetShell()->IsPreview() );
                                     if (pParentRoot)
                                     {
                                         ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
@@ -2727,7 +2727,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
                                     //directly create this acc para .
                                     xParentAccImpl = GetContextImpl(pParent);//Should Create.
 
-                                    const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
+                                    const SwFrame *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
 
                                     ::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
                                     if(xParentAccImplRoot.is())
@@ -2836,23 +2836,23 @@ void SwAccessibleMap::SetCursorContext(
 }
 
 void SwAccessibleMap::InvalidateStates( AccessibleStates _nStates,
-                                        const SwFrm* _pFrm )
+                                        const SwFrame* _pFrame )
 {
     // Start with the frame or the first upper that is accessible
-    SwAccessibleChild aFrmOrObj( _pFrm );
-    while( aFrmOrObj.GetSwFrm() &&
-            !aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
-        aFrmOrObj = aFrmOrObj.GetSwFrm()->GetUpper();
-    if( !aFrmOrObj.GetSwFrm() )
-        aFrmOrObj = GetShell()->GetLayout();
-
-    uno::Reference< XAccessible > xAcc( GetContext( aFrmOrObj.GetSwFrm() ) );
+    SwAccessibleChild aFrameOrObj( _pFrame );
+    while( aFrameOrObj.GetSwFrame() &&
+            !aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
+        aFrameOrObj = aFrameOrObj.GetSwFrame()->GetUpper();
+    if( !aFrameOrObj.GetSwFrame() )
+        aFrameOrObj = GetShell()->GetLayout();
+
+    uno::Reference< XAccessible > xAcc( GetContext( aFrameOrObj.GetSwFrame() ) );
     SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
     if( GetShell()->ActionPend() )
     {
         SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
                                        pAccImpl,
-                                       SwAccessibleChild(pAccImpl->GetFrm()),
+                                       SwAccessibleChild(pAccImpl->GetFrame()),
                                        _nStates );
         AppendEvent( aEvent );
     }
@@ -2863,22 +2863,22 @@ void SwAccessibleMap::InvalidateStates( AccessibleStates _nStates,
     }
 }
 
-void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
+void SwAccessibleMap::_InvalidateRelationSet( const SwFrame* pFrame,
                                               bool bFrom )
 {
     // first, see if this frame is accessible, and if so, get the respective
-    SwAccessibleChild aFrmOrObj( pFrm );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( pFrame );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                                        mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                                        mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                 {
                     xAcc = (*aIter).second;
                 }
@@ -2893,7 +2893,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
             if( GetShell()->ActionPend() )
             {
                 SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
-                                               pAccImpl, SwAccessibleChild(pFrm),
+                                               pAccImpl, SwAccessibleChild(pFrame),
                                                ( bFrom
                                                  ? AccessibleStates::RELATION_FROM
                                                  : AccessibleStates::RELATION_TO ) );
@@ -2910,36 +2910,36 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
     }
 }
 
-void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster,
-                                             const SwFrm* pFollow )
+void SwAccessibleMap::InvalidateRelationSet( const SwFrame* pMaster,
+                                             const SwFrame* pFollow )
 {
     _InvalidateRelationSet( pMaster, false );
     _InvalidateRelationSet( pFollow, true );
 }
 
 // invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph
-void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
+void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrame& _rTextFrame,
                                                   const bool _bFrom )
 {
-    _InvalidateRelationSet( &_rTextFrm, _bFrom );
+    _InvalidateRelationSet( &_rTextFrame, _bFrom );
 }
 
 // invalidation of text selection of a paragraph
-void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
+void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrame& _rTextFrame )
 {
     // first, see if this frame is accessible, and if so, get the respective
-    SwAccessibleChild aFrmOrObj( &_rTextFrm );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( &_rTextFrame );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                                        mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                                        mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                 {
                     xAcc = (*aIter).second;
                 }
@@ -2956,7 +2956,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
                 SwAccessibleEvent_Impl aEvent(
                     SwAccessibleEvent_Impl::CARET_OR_STATES,
                     pAccImpl,
-                    SwAccessibleChild( &_rTextFrm ),
+                    SwAccessibleChild( &_rTextFrame ),
                     AccessibleStates::TEXT_SELECTION_CHANGED );
                 AppendEvent( aEvent );
             }
@@ -2969,23 +2969,23 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
     }
 }
 
-sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm,
+sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrame& rParentFrame,
                                           vcl::Window& rChild ) const
 {
     sal_Int32 nIndex( -1 );
 
-    SwAccessibleChild aFrmOrObj( &rParentFrm );
-    if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+    SwAccessibleChild aFrameOrObj( &rParentFrame );
+    if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
     {
         uno::Reference < XAccessible > xAcc;
         {
             osl::MutexGuard aGuard( maMutex );
 
-            if( mpFrmMap )
+            if( mpFrameMap )
             {
                 SwAccessibleContextMap_Impl::iterator aIter =
-                                        mpFrmMap->find( aFrmOrObj.GetSwFrm() );
-                if( aIter != mpFrmMap->end() )
+                                        mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+                if( aIter != mpFrameMap->end() )
                 {
                     xAcc = (*aIter).second;
                 }
@@ -3007,13 +3007,13 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm,
 
 void SwAccessibleMap::UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages,
                                      const Fraction&  _rScale,
-                                     const SwPageFrm* _pSelectedPageFrm,
+                                     const SwPageFrame* _pSelectedPageFrame,
                                      const Size&      _rPreviewWinSize )
 {
     assert(GetShell()->IsPreview() && "no preview?");
     assert(mpPreview != nullptr && "no preview data?");
 
-    mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrm, _rPreviewWinSize );
+    mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrame, _rPreviewWinSize );
 
     // propagate change of VisArea through the document's
     // accessibility tree; this will also send appropriate scroll
@@ -3029,12 +3029,12 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PreviewPage*>& _rPreviewP
 
         xOldAcc = mxCursorContext;
 
-        const SwPageFrm *pSelPage = mpPreview->GetSelPage();
-        if( pSelPage && mpFrmMap )
+        const SwPageFrame *pSelPage = mpPreview->GetSelPage();
+        if( pSelPage && mpFrameMap )
         {
             SwAccessibleContextMap_Impl::iterator aIter =
-                mpFrmMap->find( pSelPage );
-            if( aIter != mpFrmMap->end() )
+                mpFrameMap->find( pSelPage );
+            if( aIter != mpFrameMap->end() )
                 xAcc = (*aIter).second;
         }
     }
@@ -3059,11 +3059,11 @@ void SwAccessibleMap::InvalidatePreviewSelection( sal_uInt16 nSelPage )
 
         xOldAcc = mxCursorContext;
 
-        const SwPageFrm *pSelPage = mpPreview->GetSelPage();
-        if( pSelPage && mpFrmMap )
+        const SwPageFrame *pSelPage = mpPreview->GetSelPage();
+        if( pSelPage && mpFrameMap )
         {
-            SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pSelPage );
-            if( aIter != mpFrmMap->end() )
+            SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pSelPage );
+            if( aIter != mpFrameMap->end() )
                 xAcc = (*aIter).second;
         }
     }
@@ -3074,9 +3074,9 @@ void SwAccessibleMap::InvalidatePreviewSelection( sal_uInt16 nSelPage )
         InvalidateCursorPosition( xAcc );
 }
 
-bool SwAccessibleMap::IsPageSelected( const SwPageFrm *pPageFrm ) const
+bool SwAccessibleMap::IsPageSelected( const SwPageFrame *pPageFrame ) const
 {
-    return mpPreview && mpPreview->GetSelPage() == pPageFrm;
+    return mpPreview && mpPreview->GetSelPage() == pPageFrame;
 }
 
 void SwAccessibleMap::FireEvents()
@@ -3364,29 +3364,29 @@ Size SwAccessibleMap::GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const
 SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
 {
     // no accessible contexts, no selection
-    if ( !mpFrmMap )
+    if ( !mpFrameMap )
     {
         return nullptr;
     }
 
     // get cursor as an instance of its base class <SwPaM>
-    SwPaM* pCrsr( nullptr );
+    SwPaM* pCursor( nullptr );
     {
-        SwCrsrShell* pCrsrShell = dynamic_cast<SwCrsrShell*>(GetShell());
-        if ( pCrsrShell )
+        SwCursorShell* pCursorShell = dynamic_cast<SwCursorShell*>(GetShell());
+        if ( pCursorShell )
         {
-            SwFEShell* pFEShell = dynamic_cast<SwFEShell*>(pCrsrShell);
+            SwFEShell* pFEShell = dynamic_cast<SwFEShell*>(pCursorShell);
             if ( !pFEShell ||
-                 ( !pFEShell->IsFrmSelected() &&
+                 ( !pFEShell->IsFrameSelected() &&
                    pFEShell->IsObjSelected() == 0 ) )
             {
                 // get cursor without updating an existing table cursor.
-                pCrsr = pCrsrShell->GetCrsr( false );
+                pCursor = pCursorShell->GetCursor( false );
             }
         }
     }
     // no cursor, no selection
-    if ( !pCrsr )
+    if ( !pCursor )
     {
         return nullptr;
     }
@@ -3394,17 +3394,17 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
     SwAccessibleSelectedParas_Impl* pRetSelectedParas( nullptr );
 
     // loop on all cursors
-    SwPaM* pRingStart = pCrsr;
+    SwPaM* pRingStart = pCursor;
     do {
 
         // for a selection the cursor has to have a mark.
         // for safety reasons assure that point and mark are in text nodes
-        if ( pCrsr->HasMark() &&
-             pCrsr->GetPoint()->nNode.GetNode().IsTextNode() &&
-             pCrsr->GetMark()->nNode.GetNode().IsTextNode() )
+        if ( pCursor->HasMark() &&
+             pCursor->GetPoint()->nNode.GetNode().IsTextNode() &&
+             pCursor->GetMark()->nNode.GetNode().IsTextNode() )
         {
-            SwPosition* pStartPos = pCrsr->Start();
-            SwPosition* pEndPos = pCrsr->End();
+            SwPosition* pStartPos = pCursor->Start();
+            SwPosition* pEndPos = pCursor->End();
             // loop on all text nodes inside the selection
             SwNodeIndex aIdx( pStartPos->nNode );
             for ( ; aIdx.GetIndex() <= pEndPos->nNode.GetIndex(); ++aIdx )
@@ -3413,13 +3413,13 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
                 if ( pTextNode )
                 {
                     // loop on all text frames registered at the text node.
-                    SwIterator<SwTextFrm,SwTextNode> aIter( *pTextNode );
-                    for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm; pTextFrm = aIter.Next() )
+                    SwIterator<SwTextFrame,SwTextNode> aIter( *pTextNode );
+                    for( SwTextFrame* pTextFrame = aIter.First(); pTextFrame; pTextFrame = aIter.Next() )
                         {
                             uno::WeakReference < XAccessible > xWeakAcc;
                             SwAccessibleContextMap_Impl::iterator aMapIter =
-                                                    mpFrmMap->find( pTextFrm );
-                            if( aMapIter != mpFrmMap->end() )
+                                                    mpFrameMap->find( pTextFrame );
+                            if( aMapIter != mpFrameMap->end() )
                             {
                                 xWeakAcc = (*aMapIter).second;
                                 SwAccessibleParaSelection aDataEntry(
@@ -3444,8 +3444,8 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
             }
 
         // prepare next turn: get next cursor in ring
-        pCrsr = static_cast<SwPaM*>( pCrsr->GetNext() );
-    } while ( pCrsr != pRingStart );
+        pCursor = static_cast<SwPaM*>( pCursor->GetNext() );
+    } while ( pCursor != pRingStart );
 
     return pRetSelectedParas;
 }
@@ -3507,15 +3507,15 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
                 {
                     ::rtl::Reference < SwAccessibleContext > xAccImpl(
                                 static_cast<SwAccessibleContext*>( xAcc.get() ) );
-                    if ( xAccImpl.is() && xAccImpl->GetFrm() )
+                    if ( xAccImpl.is() && xAccImpl->GetFrame() )
                     {
-                        const SwTextFrm* pTextFrm(
-                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
-                        OSL_ENSURE( pTextFrm,
+                        const SwTextFrame* pTextFrame(
+                            dynamic_cast<const SwTextFrame*>(xAccImpl->GetFrame()) );
+                        OSL_ENSURE( pTextFrame,
                                 "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                        if ( pTextFrm )
+                        if ( pTextFrame )
                         {
-                            InvalidateParaTextSelection( *pTextFrm );
+                            InvalidateParaTextSelection( *pTextFrame );
                         }
                     }
                 }
@@ -3535,15 +3535,15 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
             {
                 ::rtl::Reference < SwAccessibleContext > xAccImpl(
                             static_cast<SwAccessibleContext*>( xAcc.get() ) );
-                if ( xAccImpl.is() && xAccImpl->GetFrm() )
+                if ( xAccImpl.is() && xAccImpl->GetFrame() )
                 {
-                    const SwTextFrm* pTextFrm(
-                            dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
-                    OSL_ENSURE( pTextFrm,
+                    const SwTextFrame* pTextFrame(
+                            dynamic_cast<const SwTextFrame*>(xAccImpl->GetFrame()) );
+                    OSL_ENSURE( pTextFrame,
                             "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
-                    if ( pTextFrm )
+                    if ( pTextFrame )
                     {
-                        InvalidateParaTextSelection( *pTextFrm );
+                        InvalidateParaTextSelection( *pTextFrame );
                     }
                 }
             }
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 5bb25d3048ce..9b7a1bfdd7ee 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -44,12 +44,12 @@ using utl::AccessibleRelationSetHelper;
 const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const
 {
     const SwNoTextNode *pNd  = nullptr;
-    const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm *>( GetFrm() );
-    if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
+    const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame *>( GetFrame() );
+    if( pFlyFrame->Lower() && pFlyFrame->Lower()->IsNoTextFrame() )
     {
-        const SwContentFrm *pCntFrm =
-            static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
-        const SwContentNode* pSwContentNode = pCntFrm->GetNode();
+        const SwContentFrame *pContentFrame =
+            static_cast<const SwContentFrame *>( pFlyFrame->Lower() );
+        const SwContentNode* pSwContentNode = pContentFrame->GetNode();
         if(pSwContentNode != nullptr)
         {
             pNd = pSwContentNode->GetNoTextNode();
@@ -62,8 +62,8 @@ const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const
 SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
         SwAccessibleMap* pInitMap,
         sal_Int16 nInitRole,
-        const SwFlyFrm* pFlyFrm  ) :
-    SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrm ),
+        const SwFlyFrame* pFlyFrame  ) :
+    SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrame ),
     aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
     msTitle(),
     msDesc()
@@ -138,7 +138,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
         // intentional no break here
         case RES_DESCRIPTION_CHANGED:
         {
-            if ( pNd && GetFrm() )
+            if ( pNd && GetFrame() )
             {
                 const OUString sOldDesc( msDesc );
 
@@ -311,7 +311,7 @@ throw (uno::RuntimeException, std::exception)
     CHECK_FOR_DEFUNC( XAccessibleHypertext );
 
     sal_Int32 nCount = 0;
-    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrame*>(GetFrame())->GetFormat()->GetURL() );
 
     if(aURL.GetMap() || !aURL.GetURL().isEmpty())
         nCount = 1;
@@ -328,7 +328,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
+    SwFormatURL aURL( static_cast<const SwLayoutFrame*>(GetFrame())->GetFormat()->GetURL() );
 
     if( nLinkIndex > 0 )
         throw lang::IndexOutOfBoundsException();
@@ -337,7 +337,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
     {
         if ( !alink.is() )
         {
-            alink = new SwAccessibleNoTextHyperlink( this, GetFrm() );
+            alink = new SwAccessibleNoTextHyperlink( this, GetFrame() );
         }
 
         return alink;
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 17c7d5216a85..d11dd25455fb 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -29,7 +29,7 @@ namespace com { namespace star {
     namespace accessibility { struct AccessibleRelation; }
 } }
 
-class SwFlyFrm;
+class SwFlyFrame;
 class SwNoTextNode;
 class SwAccessibleNoTextHyperlink;
 
@@ -53,7 +53,7 @@ protected:
 public:
     SwAccessibleNoTextFrame( SwAccessibleMap* pInitMap,
                              sal_Int16 nInitRole,
-                             const SwFlyFrm *pFlyFrm );
+                             const SwFlyFrame *pFlyFrame );
 
     // XAccessibleContext
 
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index ddea63954254..b8dbbbf42bc6 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -37,9 +37,9 @@ using namespace css::lang;
 using namespace css::uno;
 using namespace css::accessibility;
 
-SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrm *aFrm ) :
+SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrame *aFrame ) :
     xFrame( p ),
-    mpFrm( aFrm )
+    mpFrame( aFrame )
 {
 }
 
@@ -180,8 +180,8 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
         throw lang::IndexOutOfBoundsException();
 
     Any aRet;
-    //SwFrm* pAnchor = static_cast<SwFlyFrm*>(mpFrm)->GetAnchor();
-    Reference< XAccessible > xAnchor = xFrame->GetAccessibleMap()->GetContext(mpFrm);
+    //SwFrame* pAnchor = static_cast<SwFlyFrame*>(mpFrame)->GetAnchor();
+    Reference< XAccessible > xAnchor = xFrame->GetAccessibleMap()->GetContext(mpFrame);
     //SwAccessibleNoTextFrame* pFrame = xFrame.get();
     //Reference< XAccessible > xAnchor = (XAccessible*)pFrame;
     aRet <<= xAnchor;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index bd1c881338b8..7629ef8272cc 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -35,15 +35,15 @@ class SwAccessibleNoTextHyperlink :
     friend class SwAccessibleNoTextFrame;
 
     ::rtl::Reference< SwAccessibleNoTextFrame > xFrame;
-    const SwFrm *mpFrm;
+    const SwFrame *mpFrame;
 
     SwFrameFormat *GetFormat()
     {
-        return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFormat();
+        return const_cast<SwLayoutFrame*>(static_cast<const SwLayoutFrame*>(mpFrame))->GetFormat();
     }
 public:
 
-    SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrm* aFrm );
+    SwAccessibleNoTextHyperlink( SwAccessibleNoTextFrame *p, const SwFrame* aFrame );
 
     // XAccessibleAction
     virtual sal_Int32 SAL_CALL getAccessibleActionCount()
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 32e4a9083e81..f1f2c0ce9118 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -41,7 +41,7 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePag
 
 bool SwAccessiblePage::IsSelected()
 {
-    return GetMap()->IsPageSelected( static_cast < const SwPageFrm * >( GetFrm() ) );
+    return GetMap()->IsPageSelected( static_cast < const SwPageFrame * >( GetFrame() ) );
 }
 
 void SwAccessiblePage::GetStates(
@@ -111,18 +111,18 @@ void SwAccessiblePage::_InvalidateFocus()
 }
 
 SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap,
-                                    const SwFrm* pFrame )
+                                    const SwFrame* pFrame )
     : SwAccessibleContext( pInitMap, AccessibleRole::PANEL, pFrame )
     , bIsSelected( false )
 {
     OSL_ENSURE( pFrame != nullptr, "need frame" );
     OSL_ENSURE( pInitMap != nullptr, "need map" );
-    OSL_ENSURE( pFrame->IsPageFrm(), "need page frame" );
+    OSL_ENSURE( pFrame->IsPageFrame(), "need page frame" );
 
     SolarMutexGuard aGuard;
 
     OUString sPage = OUString::number(
-        static_cast<const SwPageFrm*>( GetFrm() )->GetPhyPageNum() );
+        static_cast<const SwPageFrame*>( GetFrame() )->GetPhyPageNum() );
     SetName( GetResource( STR_ACCESS_PAGE_NAME, &sPage ) );
 }
 
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index 03e4ac8baede..784bcc161196 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -23,7 +23,7 @@
 #include "acccontext.hxx"
 
 /**
- * accessibility implementation for the page (SwPageFrm)
+ * accessibility implementation for the page (SwPageFrame)
  * The page is _only_ visible in the page preview. For the regular
  * document view, it doesn't make sense to add this additional element
  * into the hierarchy. For the page preview, however, the page is the
@@ -50,8 +50,8 @@ protected:
 
 public:
     // convenience constructor to avoid typecast;
-    // may only be called with SwPageFrm argument
-    SwAccessiblePage( SwAccessibleMap* pInitMap, const SwFrm* pFrame );
+    // may only be called with SwPageFrame argument
+    SwAccessiblePage( SwAccessibleMap* pInitMap, const SwFrame* pFrame );
 
     // XAccessibleContext methods that need to be overridden
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index fdcf1ab6821f..7fdd058a9d63 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -121,10 +121,10 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessiblePar
 
 const SwTextNode* SwAccessibleParagraph::GetTextNode() const
 {
-    const SwFrm* pFrm = GetFrm();
-    OSL_ENSURE( pFrm->IsTextFrm(), "The text frame has mutated!" );
+    const SwFrame* pFrame = GetFrame();
+    OSL_ENSURE( pFrame->IsTextFrame(), "The text frame has mutated!" );
 
-    const SwTextNode* pNode = static_cast<const SwTextFrm*>(pFrm)->GetTextNode();
+    const SwTextNode* pNode = static_cast<const SwTextFrame*>(pFrame)->GetTextNode();
     OSL_ENSURE( pNode != nullptr, "A text frame without a text node." );
 
     return pNode;
@@ -162,8 +162,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
             if(!GetPortionData().IsValidCorePosition( nIndex ) ||
                 ( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
             {
-                const SwTextFrm *pTextFrm = dynamic_cast<const SwTextFrm*>( GetFrm()  );
-                bool bFormat = (pTextFrm && pTextFrm->HasPara());
+                const SwTextFrame *pTextFrame = dynamic_cast<const SwTextFrame*>( GetFrame()  );
+                bool bFormat = (pTextFrame && pTextFrame->HasPara());
                 if(bFormat)
                 {
                     ClearPortionData();
@@ -204,23 +204,23 @@ bool SwAccessibleParagraph::GetSelection(
     nEnd = -1;
 
     // get the selection, and test whether it affects our text node
-    SwPaM* pCrsr = GetCursor( true ); // #i27301# - consider adjusted method signature
-    if( pCrsr != nullptr )
+    SwPaM* pCursor = GetCursor( true ); // #i27301# - consider adjusted method signature
+    if( pCursor != nullptr )
     {
         // get SwPosition for my node
         const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
-        for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+        for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
         {
             // ignore, if no mark
-            if( rTmpCrsr.HasMark() )
+            if( rTmpCursor.HasMark() )
             {
-                // check whether nHere is 'inside' pCrsr
-                SwPosition* pStart = rTmpCrsr.Start();
+                // check whether nHere is 'inside' pCursor
+                SwPosition* pStart = rTmpCursor.Start();
                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                SwPosition* pEnd = rTmpCrsr.End();
+                SwPosition* pEnd = rTmpCursor.End();
                 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                 if( ( nHere >= nStartIndex ) &&
                     ( nHere <= nEndIndex )      )
@@ -324,24 +324,24 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection )
 {
     // get the cursor shell; if we don't have any, we don't have a
     // cursor/selection either
-    SwPaM* pCrsr = nullptr;
-    SwCrsrShell* pCrsrShell = SwAccessibleParagraph::GetCrsrShell();
+    SwPaM* pCursor = nullptr;
+    SwCursorShell* pCursorShell = SwAccessibleParagraph::GetCursorShell();
     // #i27301# - if cursor is retrieved for selection, the cursors for
     // a table selection has to be returned.
-    if ( pCrsrShell != nullptr &&
-         ( _bForSelection || !pCrsrShell->IsTableMode() ) )
+    if ( pCursorShell != nullptr &&
+         ( _bForSelection || !pCursorShell->IsTableMode() ) )
     {
-        SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCrsrShell) !=  nullptr
-                            ? static_cast< SwFEShell * >( pCrsrShell ) : nullptr;
+        SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCursorShell) !=  nullptr
+                            ? static_cast< SwFEShell * >( pCursorShell ) : nullptr;
         if( !pFESh ||
-            !(pFESh->IsFrmSelected() || pFESh->IsObjSelected() > 0) )
+            !(pFESh->IsFrameSelected() || pFESh->IsObjSelected() > 0) )
         {
             // get the selection, and test whether it affects our text node
-            pCrsr = pCrsrShell->GetCrsr( false /* ??? */ );
+            pCursor = pCursorShell->GetCursor( false /* ??? */ );
         }
     }
 
-    return pCrsr;
+    return pCursor;
 }
 
 bool SwAccessibleParagraph::IsHeading() const
@@ -359,12 +359,12 @@ void SwAccessibleParagraph::GetStates(
     rStateSet.AddState( AccessibleStateType::MULTI_LINE );
 
     // MULTISELECTABLE
-    SwCrsrShell *pCrsrSh = GetCrsrShell();
-    if( pCrsrSh )
+    SwCursorShell *pCursorSh = GetCursorShell();
+    if( pCursorSh )
         rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
 
     // FOCUSABLE
-    if( pCrsrSh )
+    if( pCursorSh )
         rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 
     // FOCUSED (simulates node index of cursor)
@@ -532,9 +532,9 @@ void SwAccessibleParagraph::_InvalidateFocus()
 
 SwAccessibleParagraph::SwAccessibleParagraph(
         SwAccessibleMap& rInitMap,
-        const SwTextFrm& rTextFrm )
-    : SwClient( const_cast<SwTextNode*>(rTextFrm.GetTextNode()) ) // #i108125#
-    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrm )
+        const SwTextFrame& rTextFrame )
+    : SwClient( const_cast<SwTextNode*>(rTextFrame.GetTextNode()) ) // #i108125#
+    , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrame )
     , sDesc()
     , pPortionData( nullptr )
     , pHyperTextData( nullptr )
@@ -543,7 +543,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
     //Get the real heading level, Heading1 ~ Heading10
     , nHeadingLevel (-1)
     , aSelectionHelper( *this )
-    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrm ) ) // #i108125#
+    , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrame ) ) // #i108125#
     , m_bLastHasSelection(false)  //To add TEXT_SELECTION_CHANGED event
 {
     SolarMutexGuard aGuard;
@@ -578,15 +578,15 @@ void SwAccessibleParagraph::UpdatePortionData()
     throw( uno::RuntimeException )
 {
     // obtain the text frame
-    OSL_ENSURE( GetFrm() != nullptr, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
-    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
+    OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" );
+    OSL_ENSURE( GetFrame()->IsTextFrame(), "The text frame has mutated!" );
+    const SwTextFrame* pFrame = static_cast<const SwTextFrame*>( GetFrame() );
 
     // build new portion data
     delete pPortionData;
     pPortionData = new SwAccessiblePortionData(
-        pFrm->GetTextNode(), GetMap()->GetShell()->GetViewOptions() );
-    pFrm->VisitPortions( *pPortionData );
+        pFrame->GetTextNode(), GetMap()->GetShell()->GetViewOptions() );
+    pFrame->VisitPortions( *pPortionData );
 
     OSL_ENSURE( pPortionData != nullptr, "UpdatePortionData() failed" );
 }
@@ -642,7 +642,7 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
     SwTextNode* pTextNode = const_cast<SwTextNode*>( GetTextNode() );
     SwIndex aIndex( pTextNode, nStart );
     SwPosition aStartPos( *pTextNode, aIndex );
-    auto pUnoCursor(pTextNode->GetDoc()->CreateUnoCrsr( aStartPos ));
+    auto pUnoCursor(pTextNode->GetDoc()->CreateUnoCursor( aStartPos ));
     pUnoCursor->SetMark();
     pUnoCursor->GetMark()->nContent = nEnd;
 
@@ -947,13 +947,13 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
 {
     SolarMutexGuard aGuard;
 
-    const SwTextFrm *pTextFrm = dynamic_cast<const SwTextFrm*>( GetFrm()  );
-    if( !pTextFrm )
+    const SwTextFrame *pTextFrame = dynamic_cast<const SwTextFrame*>( GetFrame()  );
+    if( !pTextFrame )
     {
         THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" );
     }
 
-    const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+    const SwTextNode *pTextNd = pTextFrame->GetTextNode();
     lang::Locale aLoc( g_pBreakIt->GetLocale( pTextNd->GetLang( 0 ) ) );
 
     return aLoc;
@@ -968,24 +968,24 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
 
     utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
 
-    const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(GetFrm());
-    OSL_ENSURE( pTextFrm,
+    const SwTextFrame* pTextFrame = dynamic_cast<const SwTextFrame*>(GetFrame());
+    OSL_ENSURE( pTextFrame,
             "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
-    if ( pTextFrm )
+    if ( pTextFrame )
     {
-        const SwContentFrm* pPrevCntFrm( pTextFrm->FindPrevCnt( true ) );
-        if ( pPrevCntFrm )
+        const SwContentFrame* pPrevContentFrame( pTextFrame->FindPrevCnt( true ) );
+        if ( pPrevContentFrame )
         {
-            uno::Sequence< uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pPrevCntFrm ) };
+            uno::Sequence< uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pPrevContentFrame ) };
             AccessibleRelation aAccRel( AccessibleRelationType::CONTENT_FLOWS_FROM,
                                         aSequence );
             pHelper->AddRelation( aAccRel );
         }
 
-        const SwContentFrm* pNextCntFrm( pTextFrm->FindNextCnt( true ) );
-        if ( pNextCntFrm )
+        const SwContentFrame* pNextContentFrame( pTextFrame->FindNextCnt( true ) );
+        if ( pNextContentFrame )
         {
-            uno::Sequence< uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pNextCntFrm ) };
+            uno::Sequence< uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pNextContentFrame ) };
             AccessibleRelation aAccRel( AccessibleRelationType::CONTENT_FLOWS_TO,
                                         aSequence );
             pHelper->AddRelation( aAccRel );
@@ -1003,19 +1003,19 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
     CHECK_FOR_DEFUNC( XAccessibleContext );
 
     // get cursor shell
-    SwCrsrShell *pCrsrSh = GetCrsrShell();
-    SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature
-    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
-    const SwTextNode* pTextNd = pTextFrm->GetTextNode();
+    SwCursorShell *pCursorSh = GetCursorShell();
+    SwPaM *pCursor = GetCursor( false ); // #i27301# - consider new method signature
+    const SwTextFrame *pTextFrame = static_cast<const SwTextFrame*>( GetFrame() );
+    const SwTextNode* pTextNd = pTextFrame->GetTextNode();
 
-    if( pCrsrSh != nullptr && pTextNd != nullptr &&
-        ( pCrsr == nullptr ||
-           pCrsr->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
-          !pTextFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
+    if( pCursorSh != nullptr && pTextNd != nullptr &&
+        ( pCursor == nullptr ||
+           pCursor->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
+          !pTextFrame->IsInside( pCursor->GetPoint()->nContent.GetIndex()) ) )
     {
         // create pam for selection
         SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
-                        pTextFrm->GetOfst() );
+                        pTextFrame->GetOfst() );
         SwPosition aStartPos( *pTextNd, aIndex );
         SwPaM aPaM( aStartPos );
 
@@ -1034,8 +1034,8 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
 
 // #i71385#
 static bool lcl_GetBackgroundColor( Color & rColor,
-                             const SwFrm* pFrm,
-                             SwCrsrShell* pCrsrSh )
+                             const SwFrame* pFrame,
+                             SwCursorShell* pCursorSh )
 {
     const SvxBrushItem* pBackgrdBrush = nullptr;
     const Color* pSectionTOXColor = nullptr;
@@ -1044,8 +1044,8 @@ static bool lcl_GetBackgroundColor( Color & rColor,
     //UUUU
     drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
-    if ( pFrm &&
-         pFrm->GetBackgroundBrush( aFillAttributes, pBackgrdBrush, pSectionTOXColor, aDummyRect, false ) )
+    if ( pFrame &&
+         pFrame->GetBackgroundBrush( aFillAttributes, pBackgrdBrush, pSectionTOXColor, aDummyRect, false ) )
     {
         if ( pSectionTOXColor )
         {
@@ -1058,9 +1058,9 @@ static bool lcl_GetBackgroundColor( Color & rColor,
             return true;
         }
     }
-    else if ( pCrsrSh )
+    else if ( pCursorSh )
     {
-        rColor = pCrsrSh->Imp()->GetRetoucheColor();
+        rColor = pCursorSh->Imp()->GetRetoucheColor();
         return true;
     }
 
@@ -1072,7 +1072,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getForeground()
 {
     Color aBackgroundCol;
 
-    if ( lcl_GetBackgroundColor( aBackgroundCol, GetFrm(), GetCrsrShell() ) )
+    if ( lcl_GetBackgroundColor( aBackgroundCol, GetFrame(), GetCursorShell() ) )
     {
         if ( aBackgroundCol.IsDark() )
         {
@@ -1092,7 +1092,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
 {
     Color aBackgroundCol;
 
-    if ( lcl_GetBackgroundColor( aBackgroundCol, GetFrm(), GetCrsrShell() ) )
+    if ( lcl_GetBackgroundColor( aBackgroundCol, GetFrame(), GetCursorShell() ) )
     {
         return aBackgroundCol.GetColor();
     }
@@ -1317,8 +1317,8 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
     bool bRet = false;
 
     // get cursor shell
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell != nullptr )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell != nullptr )
     {
         // create pam for selection
         SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
@@ -1369,7 +1369,7 @@ css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabSt
         bBehindText = true;
 
     // get model position & prepare GetCharRect() arguments
-    SwCrsrMoveState aMoveState;
+    SwCursorMoveState aMoveState;
     aMoveState.m_bRealHeight = true;
     aMoveState.m_bRealWidth = true;
     SwSpecialPos aSpecialPos;
@@ -1388,15 +1388,15 @@ css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabSt
     SwRect aCoreRect;
     SwIndex aIndex( pNode, nPos );
     SwPosition aPosition( *pNode, aIndex );
-    GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState );
+    GetFrame()->GetCharRect( aCoreRect, aPosition, &aMoveState );
 
     // already get the caret position
     css::uno::Sequence< css::style::TabStop > tabs;
     const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
     if( nStrLen > 0 )
     {
-        SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
-        tabs = pTFrm->GetTabStopInfo(aCoreRect.Left());
+        SwFrame* pTFrame = const_cast<SwFrame*>(GetFrame());
+        tabs = pTFrame->GetTabStopInfo(aCoreRect.Left());
     }
 
     if( tabs.hasElements() )
@@ -1408,10 +1408,10 @@ css::uno::Sequence< css::style::TabStop > SwAccessibleParagraph::GetCurrentTabSt
         SwRect aTmpRect(0, 0, tabs[0].Position, 0);
 
         Rectangle aScreenRect( GetMap()->CoreToPixel( aTmpRect.SVRect() ));
-        SwRect aFrmLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
+        SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
 
-        Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogBounds.SVRect() ).TopLeft() );
-        aScreenRect.Move( -aFrmPixPos.X(), -aFrmPixPos.Y() );
+        Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() );
+        aScreenRect.Move( -aFramePixPos.X(), -aFramePixPos.Y() );
 
         tabs[0].Position = aScreenRect.GetWidth();
     }
@@ -1820,7 +1820,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
 
         // #i73371#
         // resolve value text::WritingMode2::PAGE of property value entry WritingMode
-        if ( !bOnlyCharAttrs && GetFrm() )
+        if ( !bOnlyCharAttrs && GetFrame() )
         {
             tAccParaPropValMap::iterator aIter = aDefAttrSeq.find( UNO_NAME_WRITING_MODE );
             if ( aIter != aDefAttrSeq.end() )
@@ -1829,17 +1829,17 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
                 sal_Int16 nVal = rPropVal.Value.get<sal_Int16>();
                 if ( nVal == text::WritingMode2::PAGE )
                 {
-                    const SwFrm* pUpperFrm( GetFrm()->GetUpper() );
-                    while ( pUpperFrm )
+                    const SwFrame* pUpperFrame( GetFrame()->GetUpper() );
+                    while ( pUpperFrame )
                     {
-                        if ( pUpperFrm->GetType() &
+                        if ( pUpperFrame->GetType() &
                                ( FRM_PAGE | FRM_FLY | FRM_SECTION | FRM_TAB | FRM_CELL ) )
                         {
-                            if ( pUpperFrm->IsVertical() )
+                            if ( pUpperFrame->IsVertical() )
                             {
                                 nVal = text::WritingMode2::TB_RL;
                             }
-                            else if ( pUpperFrm->IsRightToLeft() )
+                            else if ( pUpperFrame->IsRightToLeft() )
                             {
                                 nVal = text::WritingMode2::RL_TB;
                             }
@@ -1852,13 +1852,13 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
                             break;
                         }
 
-                        if ( const SwFlyFrm* pFlyFrm = dynamic_cast<const SwFlyFrm*>(pUpperFrm) )
+                        if ( const SwFlyFrame* pFlyFrame = dynamic_cast<const SwFlyFrame*>(pUpperFrame) )
                         {
-                            pUpperFrm = pFlyFrm->GetAnchorFrm();
+                            pUpperFrame = pFlyFrame->GetAnchorFrame();
                         }
                         else
                         {
-                            pUpperFrm = pUpperFrm->GetUpper();
+                            pUpperFrame = pUpperFrame->GetUpper();
                         }
                     }
                 }
@@ -1969,7 +1969,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
     // From the perspective of the a11y API the character attributes, which
     // are set at the automatic paragraph style of the paragraph, are treated
     // as run attributes.
-    //    SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
+    //    SwXTextCursor::GetCursorAttr( *pPaM, aSet, sal_True, sal_True );
     // get character attributes from automatic paragraph style and merge these into <aSet>
     {
         const SwTextNode* pTextNode( GetTextNode() );
@@ -1987,7 +1987,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
         SfxItemSet aCharAttrsAtPaM( pPaM->GetDoc()->GetAttrPool(),
                                     RES_CHRATR_BEGIN, RES_CHRATR_END -1,
                                     0 );
-        SwUnoCursorHelper::GetCrsrAttr(*pPaM, aCharAttrsAtPaM, true);
+        SwUnoCursorHelper::GetCursorAttr(*pPaM, aCharAttrsAtPaM, true);
         aSet.Put( aCharAttrsAtPaM );
     }
 
@@ -2269,8 +2269,8 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
         if (rValue.Name == UNO_NAME_CHAR_UNDERLINE)
         {
             //misspelled word
-            SwCrsrShell* pCrsrShell = GetCrsrShell();
-            if( pCrsrShell != nullptr && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
+            SwCursorShell* pCursorShell = GetCursorShell();
+            if( pCursorShell != nullptr && pCursorShell->GetViewOptions() && pCursorShell->GetViewOptions()->IsOnlineSpell())
             {
                 const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( nullptr != pWrongList )
@@ -2290,8 +2290,8 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
         if (rValue.Name == UNO_NAME_CHAR_UNDERLINE_COLOR)
         {
             //misspelled word
-            SwCrsrShell* pCrsrShell = GetCrsrShell();
-            if( pCrsrShell != nullptr && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
+            SwCursorShell* pCursorShell = GetCursorShell();
+            if( pCursorShell != nullptr && pCursorShell->GetViewOptions() && pCursorShell->GetViewOptions()->IsOnlineSpell())
             {
                 const SwWrongList* pWrongList = pTextNode->GetWrong();
                 if( nullptr != pWrongList )
@@ -2376,7 +2376,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
         bBehindText = true;
 
     // get model position & prepare GetCharRect() arguments
-    SwCrsrMoveState aMoveState;
+    SwCursorMoveState aMoveState;
     aMoveState.m_bRealHeight = true;
     aMoveState.m_bRealWidth = true;
     SwSpecialPos aSpecialPos;
@@ -2395,17 +2395,17 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
     SwRect aCoreRect;
     SwIndex aIndex( pNode, nPos );
     SwPosition aPosition( *pNode, aIndex );
-    GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState );
+    GetFrame()->GetCharRect( aCoreRect, aPosition, &aMoveState );
 
     // translate core coordinates into accessibility coordinates
     vcl::Window *pWin = GetWindow();
     CHECK_FOR_WINDOW( XAccessibleComponent, pWin );
 
     Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() ));
-    SwRect aFrmLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
+    SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
 
-    Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogBounds.SVRect() ).TopLeft() );
-    aScreenRect.Move( -aFrmPixPos.getX(), -aFrmPixPos.getY() );
+    Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() );
+    aScreenRect.Move( -aFramePixPos.getX(), -aFramePixPos.getY() );
 
     // convert into AWT Rectangle
     return awt::Rectangle(
@@ -2430,7 +2430,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
 
     CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
 
-    // construct SwPosition (where GetCrsrOfst() will put the result into)
+    // construct SwPosition (where GetCursorOfst() will put the result into)
     SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
     SwIndex aIndex( pNode, 0);
     SwPosition aPos( *pNode, aIndex );
@@ -2439,7 +2439,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
     vcl::Window *pWin = GetWindow();
     CHECK_FOR_WINDOW( XAccessibleComponent, pWin );
     Point aPoint( rPoint.X, rPoint.Y );
-    SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root
+    SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
     Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() );
     aPoint.setX(aPoint.getX() + aPixPos.getX());
     aPoint.setY(aPoint.getY() + aPixPos.getY());
@@ -2463,21 +2463,21 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
     }
 
     // ask core for position
-    OSL_ENSURE( GetFrm() != nullptr, "The text frame has vanished!" );
-    OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
-    const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
-    SwCrsrMoveState aMoveState;
+    OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" );
+    OSL_ENSURE( GetFrame()->IsTextFrame(), "The text frame has mutated!" );
+    const SwTextFrame* pFrame = static_cast<const SwTextFrame*>( GetFrame() );
+    SwCursorMoveState aMoveState;
     aMoveState.m_bPosMatchesBounds = true;
-    const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
+    const bool bSuccess = pFrame->GetCursorOfst( &aPos, aCorePoint, &aMoveState );
 
     SwIndex aContentIdx = aPos.nContent;
     const sal_Int32 nIndex = aContentIdx.GetIndex();
     if ( nIndex > 0 )
     {
         SwRect aResultRect;
-        pFrm->GetCharRect( aResultRect, aPos );
-        bool bVert = pFrm->IsVertical();
-        bool bR2L = pFrm->IsRightToLeft();
+        pFrame->GetCharRect( aResultRect, aPos );
+        bool bVert = pFrame->IsVertical();
+        bool bR2L = pFrame->IsRightToLeft();
 
         if ( (!bVert && aResultRect.Pos().getX() > aCorePoint.getX()) ||
              ( bVert && aResultRect.Pos().getY() > aCorePoint.getY()) ||
@@ -2486,7 +2486,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
             SwIndex aIdxPrev( pNode, nIndex - 1);
             SwPosition aPosPrev( *pNode, aIdxPrev );
             SwRect aResultRectPrev;
-            pFrm->GetCharRect( aResultRectPrev, aPosPrev );
+            pFrame->GetCharRect( aResultRectPrev, aPosPrev );
             if ( (!bVert && aResultRectPrev.Pos().getX() < aCorePoint.getX() && aResultRect.Pos().getY() == aResultRectPrev.Pos().getY()) ||
                  ( bVert && aResultRectPrev.Pos().getY() < aCorePoint.getY() && aResultRect.Pos().getX() == aResultRectPrev.Pos().getX()) ||
                  (  bR2L && aResultRectPrev.Right()   > aCorePoint.getX() && aResultRect.Pos().getY() == aResultRectPrev.Pos().getY()) )
@@ -2554,8 +2554,8 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
     bool bRet = false;
 
     // get cursor shell
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell != nullptr )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell != nullptr )
     {
         // create pam for selection
         SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
@@ -3053,7 +3053,7 @@ class SwHyperlinkIter_Impl
     size_t nPos;
 
 public:
-    explicit SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
+    explicit SwHyperlinkIter_Impl( const SwTextFrame *pTextFrame );
     const SwTextAttr *next();
     size_t getCurrHintPos() const { return nPos-1; }
 
@@ -3061,13 +3061,13 @@ public:
     sal_Int32 endIdx() const { return nEnd; }
 };
 
-SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ) :
-    pHints( pTextFrm->GetTextNode()->GetpSwpHints() ),
-    nStt( pTextFrm->GetOfst() ),
+SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrame *pTextFrame ) :
+    pHints( pTextFrame->GetTextNode()->GetpSwpHints() ),
+    nStt( pTextFrame->GetOfst() ),
     nPos( 0 )
 {
-    const SwTextFrm *pFollFrm = pTextFrm->GetFollow();
-    nEnd = pFollFrm ? pFollFrm->GetOfst() : pTextFrm->GetTextNode()->Len();
+    const SwTextFrame *pFollFrame = pTextFrame->GetFollow();
+    nEnd = pFollFrame ? pFollFrame->GetOfst() : pTextFrame->GetTextNode()->Len();
 }
 
 const SwTextAttr *SwHyperlinkIter_Impl::next()
@@ -3106,8 +3106,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
     sal_Int32 nCount = 0;
     // #i77108# - provide hyperlinks also in editable documents.
 
-    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aIter( pTextFrm );
+    const SwTextFrame *pTextFrame = static_cast<const SwTextFrame*>( GetFrame() );
+    SwHyperlinkIter_Impl aIter( pTextFrame );
     while( aIter.next() )
         nCount++;
 
@@ -3123,8 +3123,8 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
 
     uno::Reference< XAccessibleHyperlink > xRet;
 
-    const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
-    SwHyperlinkIter_Impl aHIter( pTextFrm );
+    const SwTextFrame *pTextFrame = static_cast<const SwTextFrame*>( GetFrame() );
+    SwHyperlinkIter_Impl aHIter( pTextFrame );
     sal_Int32 nTIndex = -1;
     SwTOXSortTabBase* pTBase = GetTOXSortTabBase();
     SwTextAttr* pHt = const_cast<SwTextAttr*>(aHIter.next());
@@ -3220,8 +3220,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
     sal_Int32 nRet = -1;
     // #i77108#
     {
-        const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
-        SwHyperlinkIter_Impl aHIter( pTextFrm );
+        const SwTextFrame *pTextFrame = static_cast<const SwTextFrame*>( GetFrame() );
+        SwHyperlinkIter_Impl aHIter( pTextFrame );
 
         const sal_Int32 nIdx = GetPortionData().GetModelPosition( nCharIndex );
         sal_Int32 nPos = 0;
@@ -3283,23 +3283,23 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount(  )
     SolarMutexGuard g;
 
     sal_Int32 nSeleted = 0;
-    SwPaM* pCrsr = GetCursor( true );
-    if( pCrsr != nullptr )
+    SwPaM* pCursor = GetCursor( true );
+    if( pCursor != nullptr )
     {
         // get SwPosition for my node
         const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
-        for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+        for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
         {
             // ignore, if no mark
-            if( rTmpCrsr.HasMark() )
+            if( rTmpCursor.HasMark() )
             {
-                // check whether nHere is 'inside' pCrsr
-                SwPosition* pStart = rTmpCrsr.Start();
+                // check whether nHere is 'inside' pCursor
+                SwPosition* pStart = rTmpCursor.Start();
                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                SwPosition* pEnd = rTmpCrsr.End();
+                SwPosition* pEnd = rTmpCursor.End();
                 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                 if( ( nHere >= nStartIndex ) &&
                     ( nHere <= nEndIndex )      )
@@ -3355,9 +3355,9 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
     sal_Int32 nSelected = selectionIndex;
 
     // get the selection, and test whether it affects our text node
-    SwPaM* pCrsr = GetCursor( true );
+    SwPaM* pCursor = GetCursor( true );
 
-    if( pCrsr != nullptr )
+    if( pCursor != nullptr )
     {
         bool bRet = false;
 
@@ -3366,24 +3366,24 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
-        SwPaM* pRingStart = pCrsr;
+        SwPaM* pRingStart = pCursor;
         do
         {
             // ignore, if no mark
-            if( pCrsr->HasMark() )
+            if( pCursor->HasMark() )
             {
-                // check whether nHere is 'inside' pCrsr
-                SwPosition* pStart = pCrsr->Start();
+                // check whether nHere is 'inside' pCursor
+                SwPosition* pStart = pCursor->Start();
                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                SwPosition* pEnd = pCrsr->End();
+                SwPosition* pEnd = pCursor->End();
                 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                 if( ( nHere >= nStartIndex ) &&
                     ( nHere <= nEndIndex )      )
                 {
                     if( nSelected == 0 )
                     {
-                        pCrsr->MoveTo(nullptr);
-                        delete pCrsr;
+                        pCursor->MoveTo(nullptr);
+                        delete pCursor;
                         bRet = true;
                     }
                     else
@@ -3394,9 +3394,9 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
             }
             // else: this PaM is collapsed and doesn't select anything
             if(!bRet)
-                pCrsr = pCrsr->GetNext();
+                pCursor = pCursor->GetNext();
         }
-        while( !bRet && (pCrsr != pRingStart) );
+        while( !bRet && (pCursor != pRingStart) );
     }
     return sal_True;
 }
@@ -3451,16 +3451,16 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
     }
 
     // get cursor shell
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell != nullptr )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell != nullptr )
     {
         // create pam for selection
-        pCrsrShell->StartAction();
-        SwPaM* aPaM = pCrsrShell->CreateCrsr();
+        pCursorShell->StartAction();
+        SwPaM* aPaM = pCursorShell->CreateCursor();
         aPaM->SetMark();
         aPaM->GetPoint()->nContent = GetPortionData().GetModelPosition(startOffset);
         aPaM->GetMark()->nContent =  GetPortionData().GetModelPosition(endOffset);
-        pCrsrShell->EndAction();
+        pCursorShell->EndAction();
     }
 
     return 0;
@@ -3603,21 +3603,21 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret()
         GetPortionData().GetBoundaryOfLine( nLineNo, aLineBound );
         if ( nCaretPos == aLineBound.startPos )
         {
-            SwCrsrShell* pCrsrShell = SwAccessibleParagraph::GetCrsrShell();
-            if ( pCrsrShell != nullptr )
+            SwCursorShell* pCursorShell = SwAccessibleParagraph::GetCursorShell();
+            if ( pCursorShell != nullptr )
             {
                 const awt::Rectangle aCharRect = getCharacterBounds( nCaretPos );
 
-                const SwRect& aCursorCoreRect = pCrsrShell->GetCharRect();
+                const SwRect& aCursorCoreRect = pCursorShell->GetCharRect();
                 // translate core coordinates into accessibility coordinates
                 vcl::Window *pWin = GetWindow();
                 CHECK_FOR_WINDOW( XAccessibleComponent, pWin );
 
                 Rectangle aScreenRect( GetMap()->CoreToPixel( aCursorCoreRect.SVRect() ));
 
-                SwRect aFrmLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
-                Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogBounds.SVRect() ).TopLeft() );
-                aScreenRect.Move( -aFrmPixPos.getX(), -aFrmPixPos.getY() );
+                SwRect aFrameLogBounds( GetBounds( *(GetMap()) ) ); // twip rel to doc root
+                Point aFramePixPos( GetMap()->CoreToPixel( aFrameLogBounds.SVRect() ).TopLeft() );
+                aScreenRect.Move( -aFramePixPos.getX(), -aFramePixPos.getY() );
 
                 // convert into AWT Rectangle
                 const awt::Rectangle aCursorRect( aScreenRect.Left(),
@@ -3656,23 +3656,23 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
     sal_Int32 nSelected = nIndex;
 
     // get the selection, and test whether it affects our text node
-    SwPaM* pCrsr = GetCursor( true );
-    if( pCrsr != nullptr )
+    SwPaM* pCursor = GetCursor( true );
+    if( pCursor != nullptr )
     {
         // get SwPosition for my node
         const SwTextNode* pNode = GetTextNode();
         sal_uLong nHere = pNode->GetIndex();
 
         // iterate over ring
-        for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+        for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
         {
             // ignore, if no mark
-            if( rTmpCrsr.HasMark() )
+            if( rTmpCursor.HasMark() )
             {
-                // check whether nHere is 'inside' pCrsr
-                SwPosition* pStart = rTmpCrsr.Start();
+                // check whether nHere is 'inside' pCursor
+                SwPosition* pStart = rTmpCursor.Start();
                 sal_uLong nStartIndex = pStart->nNode.GetIndex();
-                SwPosition* pEnd = rTmpCrsr.End();
+                SwPosition* pEnd = rTmpCursor.End();
                 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
                 if( ( nHere >= nStartIndex ) &&
                     ( nHere <= nEndIndex )      )
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 2433e03ad6a1..60444bf3a234 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -34,7 +34,7 @@
 #include <unordered_map>
 
 class SwField;
-class SwTextFrm;
+class SwTextFrame;
 class SwTextNode;
 class SwPaM;
 class SwAccessiblePortionData;
@@ -238,7 +238,7 @@ protected:
 public:
 
     SwAccessibleParagraph( SwAccessibleMap& rInitMap,
-                           const SwTextFrm& rTextFrm );
+                           const SwTextFrame& rTextFrame );
 
     inline operator css::accessibility::XAccessibleText *();
 
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index 5f631e14170e..18e857ed9d23 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -146,7 +146,7 @@ public:
     sal_Int32 GetModelPosition( sal_Int32 nPos ) const;
 
     /// fill a SwSpecialPos structure, suitable for calling
-    /// SwTextFrm->GetCharRect
+    /// SwTextFrame->GetCharRect
     /// Returns the core position, and fills rpPos either with NULL or
     /// with the &rPos, after putting the appropriate data into it.
     sal_Int32 FillSpecialPos( sal_Int32 nPos,
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 07f17d27fc64..dd674de28d30 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -84,7 +84,7 @@ void SwAccessibleSelectionHelper::selectAccessibleChild(
 {
     SolarMutexGuard aGuard;
 
-    // Get the respective child as SwFrm (also do index checking), ...
+    // Get the respective child as SwFrame (also do index checking), ...
     const SwAccessibleChild aChild = m_rContext.GetChild( *(m_rContext.GetMap()),
                                                         nChildIndex );
     if( !aChild.IsValid() )
@@ -97,20 +97,20 @@ void SwAccessibleSelectionHelper::selectAccessibleChild(
     {
         const SdrObject *pObj = aChild.GetDrawObject();
         if( pObj )
-            m_rContext.Select( const_cast< SdrObject *>( pObj ), nullptr==aChild.GetSwFrm());
+            m_rContext.Select( const_cast< SdrObject *>( pObj ), nullptr==aChild.GetSwFrame());
     }
     // no frame shell, or no frame, or no fly frame -> can't select
 }
 
-//When the selected state of the SwFrmOrObj is setted, return true.
+//When the selected state of the SwFrameOrObj is setted, return true.
 static bool lcl_getSelectedState(const SwAccessibleChild& aChild,
                                      SwAccessibleContext* pContext,
                                      SwAccessibleMap* pMap)
 {
     Reference< XAccessible > xAcc;
-    if ( aChild.GetSwFrm() )
+    if ( aChild.GetSwFrame() )
     {
-        xAcc = pMap->GetContext( aChild.GetSwFrm(), false );
+        xAcc = pMap->GetContext( aChild.GetSwFrame(), false );
     }
     else if ( aChild.GetDrawObject() )
     {
@@ -144,7 +144,7 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
 {
     SolarMutexGuard aGuard;
 
-    // Get the respective child as SwFrm (also do index checking), ...
+    // Get the respective child as SwFrame (also do index checking), ...
     const SwAccessibleChild aChild = m_rContext.GetChild( *(m_rContext.GetMap()),
                                                         nChildIndex );
     if( !aChild.IsValid() )
@@ -155,15 +155,15 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
     const SwFEShell* pFEShell = GetFEShell();
     if( pFEShell )
     {
-        if ( aChild.GetSwFrm() != nullptr )
+        if ( aChild.GetSwFrame() != nullptr )
         {
-            bRet = (pFEShell->GetSelectedFlyFrm() == aChild.GetSwFrm());
+            bRet = (pFEShell->GetSelectedFlyFrame() == aChild.GetSwFrame());
         }
         else if ( aChild.GetDrawObject() )
         {
             bRet = pFEShell->IsObjSelected( *aChild.GetDrawObject() );
         }
-        //If the SwFrmOrObj is not selected directly in the UI, we should check whether it is selected in the selection cursor.
+        //If the SwFrameOrObj is not selected directly in the UI, we should check whether it is selected in the selection cursor.
         if( !bRet )
         {
             if( lcl_getSelectedState( aChild, &m_rContext, m_rContext.GetMap() ) )
@@ -194,11 +194,11 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren(  )
         {
             const SwAccessibleChild& rChild = *aIter;
             const SdrObject* pObj = rChild.GetDrawObject();
-            const SwFrm* pFrm = rChild.GetSwFrm();
-            if( pObj && !(pFrm != nullptr && pFEShell->IsObjSelected()) )
+            const SwFrame* pFrame = rChild.GetSwFrame();
+            if( pObj && !(pFrame != nullptr && pFEShell->IsObjSelected()) )
             {
-                m_rContext.Select( const_cast< SdrObject *>( pObj ), nullptr==pFrm );
-                if( pFrm )
+                m_rContext.Select( const_cast< SdrObject *>( pObj ), nullptr==pFrame );
+                if( pFrame )
                     break;
             }
             ++aIter;
@@ -217,8 +217,8 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
     const SwFEShell* pFEShell = GetFEShell();
     if( pFEShell != nullptr )
     {
-        const SwFlyFrm* pFlyFrm = pFEShell->GetSelectedFlyFrm();
-        if( pFlyFrm )
+        const SwFlyFrame* pFlyFrame = pFEShell->GetSelectedFlyFrame();
+        if( pFlyFrame )
         {
             nCount = 1;
         }
@@ -237,9 +237,9 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
                 while( aIter != aEndIter && static_cast<size_t>(nCount) < nSelObjs )
                 {
                     const SwAccessibleChild& rChild = *aIter;
-                    if( rChild.GetDrawObject() && !rChild.GetSwFrm() &&
+                    if( rChild.GetDrawObject() && !rChild.GetSwFrame() &&
                         SwAccessibleFrame::GetParent(rChild, m_rContext.IsInPagePreview())
-                           == m_rContext.GetFrm() &&
+                           == m_rContext.GetFrame() &&
                         pFEShell->IsObjSelected( *rChild.GetDrawObject() ) )
                     {
                         nCount++;
@@ -248,7 +248,7 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
                 }
             }
         }
-        //If the SwFrmOrObj is not selected directly in the UI,
+        //If the SwFrameOrObj is not selected directly in the UI,
         //we should check whether it is selected in the selection cursor.
         if( nCount == 0 )
         {
@@ -286,25 +286,25 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
         throwIndexOutOfBoundsException();
 
     SwAccessibleChild aChild;
-    const SwFlyFrm *pFlyFrm = pFEShell->GetSelectedFlyFrm();
-    if( pFlyFrm )
+    const SwFlyFrame *pFlyFrame = pFEShell->GetSelectedFlyFrame();
+    if( pFlyFrame )
     {
         if( 0 == nSelectedChildIndex )
         {
-            if(SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview()) == m_rContext.GetFrm() )
+            if(SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrame), m_rContext.IsInPagePreview()) == m_rContext.GetFrame() )
             {
-                aChild = pFlyFrm;
+                aChild = pFlyFrame;
             }
             else
             {
-                const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+                const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
                 if (pFrameFormat)
                 {
                     const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
                     if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
                     {
-                        const SwFrm  *pParaFrm =  SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview() );
-                        aChild  = pParaFrm;
+                        const SwFrame  *pParaFrame =  SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrame), m_rContext.IsInPagePreview() );
+                        aChild  = pParaFrame;
                     }
                 }
             }
@@ -324,9 +324,9 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
         while( aIter != aEndIter && !aChild.IsValid() )
         {
             const SwAccessibleChild& rChild = *aIter;
-            if( rChild.GetDrawObject() && !rChild.GetSwFrm() &&
+            if( rChild.GetDrawObject() && !rChild.GetSwFrame() &&
                 SwAccessibleFrame::GetParent(rChild, m_rContext.IsInPagePreview()) ==
-                    m_rContext.GetFrm() &&
+                    m_rContext.GetFrame() &&
                 pFEShell->IsObjSelected( *rChild.GetDrawObject() ) )
             {
                 if( 0 == nSelectedChildIndex )
@@ -343,10 +343,10 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
 
     OSL_ENSURE( m_rContext.GetMap() != nullptr, "We need the map." );
     Reference< XAccessible > xChild;
-    if( aChild.GetSwFrm() )
+    if( aChild.GetSwFrame() )
     {
         ::rtl::Reference < SwAccessibleContext > xChildImpl(
-                m_rContext.GetMap()->GetContextImpl( aChild.GetSwFrm() ) );
+                m_rContext.GetMap()->GetContextImpl( aChild.GetSwFrame() ) );
         if( xChildImpl.is() )
         {
             xChildImpl->SetParent( &m_rContext );
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index f94a05537659..04541c8fa9ac 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -78,34 +78,34 @@ class SwAccessibleTableData_Impl
     Int32Set_Impl   maRows;
     Int32Set_Impl   maColumns;
     ::std::list < Int32Pair_Impl > maExtents;   // cell extends for event processing only
-    Point   maTabFrmPos;
-    const SwTabFrm *mpTabFrm;
+    Point   maTabFramePos;
+    const SwTabFrame *mpTabFrame;
     bool mbIsInPagePreview;
     bool mbOnlyTableColumnHeader;
 
-    void CollectData( const SwFrm *pFrm );
-    void CollectColumnHeaderData( const SwFrm *pFrm );
-    void CollectRowHeaderData( const SwFrm *pFrm );
-    void CollectExtents( const SwFrm *pFrm );
+    void CollectData( const SwFrame *pFrame );
+    void CollectColumnHeaderData( const SwFrame *pFrame );
+    void CollectRowHeaderData( const SwFrame *pFrame );
+    void CollectExtents( const SwFrame *pFrame );
 
-    bool FindCell( const Point& rPos, const SwFrm *pFrm ,
-                           bool bExact, const SwFrm *& rFrm ) const;
+    bool FindCell( const Point& rPos, const SwFrame *pFrame ,
+                           bool bExact, const SwFrame *& rFrame ) const;
 
     void GetSelection( const Point& rTabPos, const SwRect& rArea,
-                       const SwSelBoxes& rSelBoxes, const SwFrm *pFrm,
+                       const SwSelBoxes& rSelBoxes, const SwFrame *pFrame,
                        SwAccTableSelHander_Impl& rSelHdl,
                        bool bColumns ) const;
 
     // #i77106#
-    inline bool IncludeRow( const SwFrm& rFrm ) const
+    inline bool IncludeRow( const SwFrame& rFrame ) const
     {
         return !mbOnlyTableColumnHeader ||
-               mpTabFrm->IsInHeadline( rFrm );
+               mpTabFrame->IsInHeadline( rFrame );
     }
 public:
     // #i77106# - add third optional parameter <bOnlyTableColumnHeader>, default value <false>
     SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap,
-                                const SwTabFrm *pTabFrm,
+                                const SwTabFrame *pTabFrame,
                                 bool bIsInPagePreview,
                                 bool bOnlyTableColumnHeader = false );
 
@@ -115,10 +115,10 @@ public:
     inline Int32Set_Impl::const_iterator GetRowIter( sal_Int32 nRow ) const;
     inline Int32Set_Impl::const_iterator GetColumnIter( sal_Int32 nCol ) const;
 
-    const SwFrm *GetCell( sal_Int32 nRow, sal_Int32 nColumn, bool bExact,
+    const SwFrame *GetCell( sal_Int32 nRow, sal_Int32 nColumn, bool bExact,
                           SwAccessibleTable *pThis ) const
         throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception);
-    const SwFrm *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop,
+    const SwFrame *GetCellAtPos( sal_Int32 nLeft, sal_Int32 nTop,
                                          bool bExact ) const;
     inline sal_Int32 GetRowCount() const;
     inline sal_Int32 GetColumnCount() const;
@@ -138,34 +138,34 @@ public:
                                   sal_Int32& rRowExtent,
                                   sal_Int32& rColumnExtent ) const;
 
-    const Point& GetTablePos() const { return maTabFrmPos; }
-    void SetTablePos( const Point& rPos ) { maTabFrmPos = rPos; }
+    const Point& GetTablePos() const { return maTabFramePos; }
+    void SetTablePos( const Point& rPos ) { maTabFramePos = rPos; }
 };
 
-void SwAccessibleTableData_Impl::CollectData( const SwFrm *pFrm )
+void SwAccessibleTableData_Impl::CollectData( const SwFrame *pFrame )
 {
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         if( pLower )
         {
-            if( pLower->IsRowFrm() )
+            if( pLower->IsRowFrame() )
             {
                 // #i77106#
                 if ( IncludeRow( *pLower ) )
                 {
-                    maRows.insert( pLower->Frm().Top() - maTabFrmPos.getY() );
+                    maRows.insert( pLower->Frame().Top() - maTabFramePos.getY() );
                     CollectData( pLower );
                 }
             }
-            else if( pLower->IsCellFrm() &&
+            else if( pLower->IsCellFrame() &&
                      rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                maColumns.insert( pLower->Frm().Left() - maTabFrmPos.getX() );
+                maColumns.insert( pLower->Frame().Left() - maTabFramePos.getX() );
             }
             else
             {
@@ -176,39 +176,39 @@ void SwAccessibleTableData_Impl::CollectData( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm )
+void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrame *pFrame )
 {
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         if( pLower )
         {
-            if( pLower->IsRowFrm() )
+            if( pLower->IsRowFrame() )
             {
 
-                const SwTableLine* pLine = static_cast<const SwRowFrm*>(pLower)->GetTabLine();
+                const SwTableLine* pLine = static_cast<const SwRowFrame*>(pLower)->GetTabLine();
                 while( pLine->GetUpper() )
                     pLine = pLine->GetUpper()->GetUpper();
 
                 // Headerline?
-                //if(mpTabFrm->GetTable()->GetTabLines()[ 0 ] != pLine)
+                //if(mpTabFrame->GetTable()->GetTabLines()[ 0 ] != pLine)
                 //return ;
 
-                maRows.insert( pLower->Frm().Top() - maTabFrmPos.Y() );
+                maRows.insert( pLower->Frame().Top() - maTabFramePos.Y() );
 
                 CollectRowHeaderData( pLower );
 
             }
-            else if( pLower->IsCellFrm() &&
+            else if( pLower->IsCellFrame() &&
                      rLower.IsAccessible( mbIsInPagePreview ) )
             {
                 //Added by yanjun. Can't find the "GetRowHeaderFlag" function (need verify).
-                //if(static_cast<SwCellFrm*>(pLower)->GetRowHeaderFlag())
-                //  maColumns.insert( pLower->Frm().Left() - maTabFrmPos.X() );
+                //if(static_cast<SwCellFrame*>(pLower)->GetRowHeaderFlag())
+                //  maColumns.insert( pLower->Frame().Left() - maTabFramePos.X() );
             }
             else
             {
@@ -219,42 +219,42 @@ void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrm *pFrm )
+void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrame *pFrame )
 {
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         if( pLower )
         {
-            if( pLower->IsRowFrm() )
+            if( pLower->IsRowFrame() )
             {
 
-                const SwTableLine* pLine = static_cast<const SwRowFrm*>(pLower)->GetTabLine();
+                const SwTableLine* pLine = static_cast<const SwRowFrame*>(pLower)->GetTabLine();
                 while( pLine->GetUpper() )
                     pLine = pLine->GetUpper()->GetUpper();
 
                 // Headerline?
-                //if(mpTabFrm->GetTable()->GetTabLines()[ 0 ] != pLine)
+                //if(mpTabFrame->GetTable()->GetTabLines()[ 0 ] != pLine)
                 //return ;
 
                 //if the current line is now header line, then return ;
-                sal_Int16 iCurrentRowIndex = mpTabFrm->GetTable()->GetTabLines().GetPos( pLine);
-                if(iCurrentRowIndex >= mpTabFrm->GetTable()->_GetRowsToRepeat())
+                sal_Int16 iCurrentRowIndex = mpTabFrame->GetTable()->GetTabLines().GetPos( pLine);
+                if(iCurrentRowIndex >= mpTabFrame->GetTable()->_GetRowsToRepeat())
                     return ;
 
-                maRows.insert( pLower->Frm().Top() - maTabFrmPos.Y() );
+                maRows.insert( pLower->Frame().Top() - maTabFramePos.Y() );
 
                 CollectColumnHeaderData( pLower );
 
             }
-            else if( pLower->IsCellFrm() &&
+            else if( pLower->IsCellFrame() &&
                      rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                maColumns.insert( pLower->Frm().Left() - maTabFrmPos.X() );
+                maColumns.insert( pLower->Frame().Left() - maTabFramePos.X() );
             }
             else
             {
@@ -265,23 +265,23 @@ void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrm *pFrm )
     }
 }
 
-void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
+void SwAccessibleTableData_Impl::CollectExtents( const SwFrame *pFrame )
 {
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         if( pLower )
         {
-            if( pLower->IsCellFrm() &&
+            if( pLower->IsCellFrame() &&
                 rLower.IsAccessible( mbIsInPagePreview ) )
             {
                 sal_Int32 nRow, nCol;
                 Int32Pair_Impl aCellExtents;
-                GetRowColumnAndExtent( pLower->Frm(), nRow, nCol,
+                GetRowColumnAndExtent( pLower->Frame(), nRow, nCol,
                                        aCellExtents.first,
                                        aCellExtents.second );
 
@@ -290,7 +290,7 @@ void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
             else
             {
                 // #i77106#
-                if ( !pLower->IsRowFrm() ||
+                if ( !pLower->IsRowFrame() ||
                      IncludeRow( *pLower ) )
                 {
                     CollectExtents( pLower );
@@ -302,33 +302,33 @@ void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
 }
 
 bool SwAccessibleTableData_Impl::FindCell(
-        const Point& rPos, const SwFrm *pFrm, bool bExact,
-        const SwFrm *& rRet ) const
+        const Point& rPos, const SwFrame *pFrame, bool bExact,
+        const SwFrame *& rRet ) const
 {
     bool bFound = false;
 
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( !bFound && aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         OSL_ENSURE( pLower, "child should be a frame" );
         if( pLower )
         {
             if( rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
-                const SwRect& rFrm = pLower->Frm();
-                if( rFrm.Right() >= rPos.X() && rFrm.Bottom() >= rPos.Y() )
+                OSL_ENSURE( pLower->IsCellFrame(), "lower is not a cell frame" );
+                const SwRect& rFrame = pLower->Frame();
+                if( rFrame.Right() >= rPos.X() && rFrame.Bottom() >= rPos.Y() )
                 {
                     // We have found the cell
-                    OSL_ENSURE( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
+                    OSL_ENSURE( rFrame.Left() <= rPos.X() && rFrame.Top() <= rPos.Y(),
                             "find frame moved to far!" );
                     bFound = true;
                     if( !bExact ||
-                        (rFrm.Top() == rPos.Y() && rFrm.Left() == rPos.Y() ) )
+                        (rFrame.Top() == rPos.Y() && rFrame.Left() == rPos.Y() ) )
                     {
                         rRet = pLower;
                     }
@@ -337,7 +337,7 @@ bool SwAccessibleTableData_Impl::FindCell(
             else
             {
                 // #i77106#
-                if ( !pLower->IsRowFrm() ||
+                if ( !pLower->IsRowFrame() ||
                      IncludeRow( *pLower ) )
                 {
                     bFound = FindCell( rPos, pLower, bExact, rRet );
@@ -354,28 +354,28 @@ void SwAccessibleTableData_Impl::GetSelection(
             const Point& rTabPos,
             const SwRect& rArea,
             const SwSelBoxes& rSelBoxes,
-            const SwFrm *pFrm,
+            const SwFrame *pFrame,
             SwAccTableSelHander_Impl& rSelHdl,
             bool bColumns ) const
 {
-    const SwAccessibleChildSList aList( *pFrm, mrAccMap );
+    const SwAccessibleChildSList aList( *pFrame, mrAccMap );
     SwAccessibleChildSList::const_iterator aIter( aList.begin() );
     SwAccessibleChildSList::const_iterator aEndIter( aList.end() );
     while( aIter != aEndIter )
     {
         const SwAccessibleChild& rLower = *aIter;
-        const SwFrm *pLower = rLower.GetSwFrm();
+        const SwFrame *pLower = rLower.GetSwFrame();
         OSL_ENSURE( pLower, "child should be a frame" );
         const SwRect& rBox = rLower.GetBox( mrAccMap );
         if( pLower && rBox.IsOver( rArea ) )
         {
             if( rLower.IsAccessible( mbIsInPagePreview ) )
             {
-                OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
-                const SwCellFrm *pCFrm =
-                        static_cast < const SwCellFrm * >( pLower );
+                OSL_ENSURE( pLower->IsCellFrame(), "lower is not a cell frame" );
+                const SwCellFrame *pCFrame =
+                        static_cast < const SwCellFrame * >( pLower );
                 SwTableBox *pBox =
-                    const_cast< SwTableBox *>( pCFrm->GetTabBox() );
+                    const_cast< SwTableBox *>( pCFrame->GetTabBox() );
                 if( rSelBoxes.find( pBox ) == rSelBoxes.end() )
                 {
                     const Int32Set_Impl rRowsOrCols =
@@ -403,7 +403,7 @@ void SwAccessibleTableData_Impl::GetSelection(
             else
             {
                 // #i77106#
-                if ( !pLower->IsRowFrm() ||
+                if ( !pLower->IsRowFrame() ||
                      IncludeRow( *pLower ) )
                 {
                     GetSelection( rTabPos, rArea, rSelBoxes, pLower, rSelHdl,
@@ -415,7 +415,7 @@ void SwAccessibleTableData_Impl::GetSelection(
     }
 }
 
-const SwFrm *SwAccessibleTableData_Impl::GetCell(
+const SwFrame *SwAccessibleTableData_Impl::GetCell(
         sal_Int32 nRow, sal_Int32 nColumn, bool,
         SwAccessibleTable *pThis ) const
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
@@ -424,9 +424,9 @@ const SwFrm *SwAccessibleTableData_Impl::GetCell(
 
     Int32Set_Impl::const_iterator aSttCol( GetColumnIter( nColumn ) );
     Int32Set_Impl::const_iterator aSttRow( GetRowIter( nRow ) );
-    const SwFrm *pCellFrm = GetCellAtPos( *aSttCol, *aSttRow, false );
+    const SwFrame *pCellFrame = GetCellAtPos( *aSttCol, *aSttRow, false );
 
-    return pCellFrm;
+    return pCellFrame;
 }
 
 void SwAccessibleTableData_Impl::GetSelection(
@@ -435,7 +435,7 @@ void SwAccessibleTableData_Impl::GetSelection(
                           SwAccTableSelHander_Impl& rSelHdl,
                        bool bColumns ) const
 {
-    SwRect aArea( mpTabFrm->Frm() );
+    SwRect aArea( mpTabFrame->Frame() );
     Point aPos( aArea.Pos() );
 
     const Int32Set_Impl& rRowsOrColumns = bColumns ? maColumns : maRows;
@@ -460,16 +460,16 @@ void SwAccessibleTableData_Impl::GetSelection(
             aArea.Bottom( *aEnd + aPos.getY() - 1 );
     }
 
-    GetSelection( aPos, aArea, rSelBoxes, mpTabFrm, rSelHdl, bColumns );
+    GetSelection( aPos, aArea, rSelBoxes, mpTabFrame, rSelHdl, bColumns );
 }
 
-const SwFrm *SwAccessibleTableData_Impl::GetCellAtPos(
+const SwFrame *SwAccessibleTableData_Impl::GetCellAtPos(
         sal_Int32 nLeft, sal_Int32 nTop, bool bExact ) const
 {
-    Point aPos( mpTabFrm->Frm().Pos() );
+    Point aPos( mpTabFrame->Frame().Pos() );
     aPos.Move( nLeft, nTop );
-    const SwFrm *pRet = nullptr;
-    FindCell( aPos, mpTabFrm, bExact, pRet );
+    const SwFrame *pRet = nullptr;
+    FindCell( aPos, mpTabFrame, bExact, pRet );
 
     return pRet;
 }
@@ -496,17 +496,17 @@ bool SwAccessibleTableData_Impl::CompareExtents(
 }
 
 SwAccessibleTableData_Impl::SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap,
-                                                        const SwTabFrm *pTabFrm,
+                                                        const SwTabFrame *pTabFrame,
                                                         bool bIsInPagePreview,
                                                         bool bOnlyTableColumnHeader )
     : mrAccMap( rAccMap )
-    , maTabFrmPos( pTabFrm->Frm().Pos() )
-    , mpTabFrm( pTabFrm )
+    , maTabFramePos( pTabFrame->Frame().Pos() )
+    , mpTabFrame( pTabFrame )
     , mbIsInPagePreview( bIsInPagePreview )
     , mbOnlyTableColumnHeader( bOnlyTableColumnHeader )
 {
-    CollectData( mpTabFrm );
-    CollectExtents( mpTabFrm );
+    CollectData( mpTabFrame );
+    CollectExtents( mpTabFrame );
 }
 
 inline Int32Set_Impl::const_iterator SwAccessibleTableData_Impl::GetRowIter(
@@ -554,16 +554,16 @@ void SwAccessibleTableData_Impl::GetRowColumnAndExtent(
         sal_Int32& rRowExtent, sal_Int32& rColumnExtent ) const
 {
     Int32Set_Impl::const_iterator aStt(
-                maRows.lower_bound( rBox.Top() - maTabFrmPos.Y() ) );
+                maRows.lower_bound( rBox.Top() - maTabFramePos.Y() ) );
     Int32Set_Impl::const_iterator aEnd(
-                maRows.upper_bound( rBox.Bottom() - maTabFrmPos.Y() ) );
+                maRows.upper_bound( rBox.Bottom() - maTabFramePos.Y() ) );
     rRow =
          static_cast< sal_Int32 >( ::std::distance( maRows.begin(), aStt ) );
     rRowExtent =
          static_cast< sal_Int32 >( ::std::distance( aStt, aEnd ) );
 
-    aStt = maColumns.lower_bound( rBox.Left() - maTabFrmPos.X() );
-    aEnd = maColumns.upper_bound( rBox.Right() - maTabFrmPos.X() );
+    aStt = maColumns.lower_bound( rBox.Left() - maTabFramePos.X() );
+    aEnd = maColumns.upper_bound( rBox.Right() - maTabFramePos.X() );
     rColumn =
          static_cast< sal_Int32 >( ::std::distance( maColumns.begin(), aStt ) );
     rColumnExtent =
@@ -661,10 +661,10 @@ void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol,
 const SwSelBoxes *SwAccessibleTable::GetSelBoxes() const
 {
     const SwSelBoxes *pSelBoxes = nullptr;
-    const SwCrsrShell *pCSh = GetCrsrShell();
+    const SwCursorShell *pCSh = GetCursorShell();
     if( (pCSh != nullptr) && pCSh->IsTableMode() )
     {
-        pSelBoxes = &pCSh->GetTableCrsr()->GetSelectedBoxes();
+        pSelBoxes = &pCSh->GetTableCursor()->GetSelectedBoxes();
     }
 
     return pSelBoxes;
@@ -696,14 +696,14 @@ const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const
 
     // get table box for 'our' table cell
     SwAccessibleChild aCell( GetChild( *(const_cast<SwAccessibleMap*>(GetMap())), nChildIndex ) );
-    if( aCell.GetSwFrm()  )
+    if( aCell.GetSwFrame()  )
     {
-        const SwFrm* pChildFrm = aCell.GetSwFrm();
-        if( (pChildFrm != nullptr) && pChildFrm->IsCellFrm() )
+        const SwFrame* pChildFrame = aCell.GetSwFrame();
+        if( (pChildFrame != nullptr) && pChildFrame->IsCellFrame() )
         {
-            const SwCellFrm* pCellFrm =
-                static_cast<const SwCellFrm*>( pChildFrm );
-            pBox = pCellFrm->GetTabBox();
+            const SwCellFrame* pCellFrame =
+                static_cast<const SwCellFrame*>( pChildFrame );
+            pBox = pCellFrame->GetTabBox();
         }
     }
 
@@ -757,25 +757,25 @@ void SwAccessibleTable::GetStates(
     rStateSet.AddState( AccessibleStateType::RESIZABLE );
     // MULTISELECTABLE
     rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell  )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell  )
         rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
 }
 
 SwAccessibleTable::SwAccessibleTable(
         SwAccessibleMap* pInitMap,
-        const SwTabFrm* pTabFrm  ) :
-    SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrm ),
+        const SwTabFrame* pTabFrame  ) :
+    SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrame ),
     mpTableData( nullptr )
 {
     SolarMutexGuard aGuard;
 
-    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const SwFrameFormat *pFrameFormat = pTabFrame->GetFormat();
     const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
 
-    SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+    SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrame->GetPhyPageNum() ) );
 
-    const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFormat()->GetName() );
+    const OUString sArg1( static_cast< const SwTabFrame * >( GetFrame() )->GetFormat()->GetName() );
     const OUString sArg2( GetFormattedPageNumber() );
 
     sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
@@ -792,19 +792,19 @@ SwAccessibleTable::~SwAccessibleTable()
 void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
 {
     sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
-    const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( GetFrm() );
+    const SwTabFrame *pTabFrame = static_cast< const SwTabFrame * >( GetFrame() );
     switch( nWhich )
     {
     case RES_NAME_CHANGED:
-        if( pTabFrm )
+        if( pTabFrame )
         {
-            const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+            const SwFrameFormat *pFrameFormat = pTabFrame->GetFormat();
             OSL_ENSURE( pFrameFormat == GetRegisteredIn(), "invalid frame" );
 
             const OUString sOldName( GetName() );
             const OUString sNewTabName = pFrameFormat->GetName();
 
-            SetName( sNewTabName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+            SetName( sNewTabName + "-" + OUString::number( pTabFrame->GetPhyPageNum() ) );
 
             if( sOldName != GetName() )
             {
@@ -894,8 +894,8 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId()
 // #i77106#
 SwAccessibleTableData_Impl* SwAccessibleTable::CreateNewTableData()
 {
-    const SwTabFrm* pTabFrm = static_cast<const SwTabFrm*>( GetFrm() );
-    return new SwAccessibleTableData_Impl( *GetMap(), pTabFrm, IsInPagePreview() );
+    const SwTabFrame* pTabFrame = static_cast<const SwTabFrame*>( GetFrame() );
+    return new SwAccessibleTableData_Impl( *GetMap(), pTabFrame, IsInPagePreview() );
 }
 
 void SwAccessibleTable::UpdateTableData()
@@ -1026,12 +1026,12 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
                                     GetTableData().GetColumnIter( nColumn ) );
     Int32Set_Impl::const_iterator aSttRow(
                                     GetTableData().GetRowIter( nRow ) );
-    const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
+    const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
                                                          false );
-    if( pCellFrm )
+    if( pCellFrame )
     {
-        sal_Int32 nBottom = pCellFrm->Frm().Bottom();
-        nBottom -= GetFrm()->Frm().Top();
+        sal_Int32 nBottom = pCellFrame->Frame().Bottom();
+        nBottom -= GetFrame()->Frame().Top();
         Int32Set_Impl::const_iterator aEndRow(
                 GetTableData().GetRows().upper_bound( nBottom ) );
         nExtend =
@@ -1058,12 +1058,12 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
                                     GetTableData().GetColumnIter( nColumn ) );
     Int32Set_Impl::const_iterator aSttRow(
                                     GetTableData().GetRowIter( nRow ) );
-    const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
+    const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow,
                                                          false );
-    if( pCellFrm )
+    if( pCellFrame )
     {
-        sal_Int32 nRight = pCellFrm->Frm().Right();
-        nRight -= GetFrm()->Frm().Left();
+        sal_Int32 nRight = pCellFrame->Frame().Right();
+        nRight -= GetFrame()->Frame().Left();
         Int32Set_Impl::const_iterator aEndCol(
                 GetTableData().GetColumns().upper_bound( nRight ) );
         nExtend =
@@ -1088,7 +1088,7 @@ uno::Reference< XAccessibleTable > SAL_CALL
     // #i87532# - assure that return accessible object is empty,
     // if no column header exists.
     SwAccessibleTableColHeaders* pTableColHeaders =
-        new SwAccessibleTableColHeaders( GetMap(), static_cast< const SwTabFrm *>( GetFrm() ) );
+        new SwAccessibleTableColHeaders( GetMap(), static_cast< const SwTabFrame *>( GetFrame() ) );
     uno::Reference< XAccessibleTable > xTableColumnHeaders( pTableColHeaders );
     if ( pTableColHeaders->getAccessibleChildCount() <= 0 )
     {
@@ -1209,10 +1209,10 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
 
     CHECK_FOR_DEFUNC( XAccessibleTable )
 
-    const SwFrm *pCellFrm =
+    const SwFrame *pCellFrame =
                     GetTableData().GetCell( nRow, nColumn, false, this );
-    if( pCellFrm )
-        xRet = GetMap()->GetContext( pCellFrm );
+    if( pCellFrame )
+        xRet = GetMap()->GetContext( pCellFrame );
 
     return xRet;
 }
@@ -1241,16 +1241,16 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
 
     CHECK_FOR_DEFUNC( XAccessibleTable )
 
-    const SwFrm *pFrm =
+    const SwFrame *pFrame =
                     GetTableData().GetCell( nRow, nColumn, false, this );
-    if( pFrm && pFrm->IsCellFrm() )
+    if( pFrame && pFrame->IsCellFrame() )
     {
         const SwSelBoxes *pSelBoxes = GetSelBoxes();
         if( pSelBoxes )
         {
-            const SwCellFrm *pCFrm = static_cast < const SwCellFrm * >( pFrm );
+            const SwCellFrame *pCFrame = static_cast < const SwCellFrame * >( pFrame );
             SwTableBox *pBox =
-                const_cast< SwTableBox *>( pCFrm->GetTabBox() );
+                const_cast< SwTableBox *>( pCFrame->GetTabBox() );
             bRet = pSelBoxes->find( pBox ) != pSelBoxes->end();
         }
     }
@@ -1294,10 +1294,10 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
     }
 
     SwAccessibleChild aCell( GetChild( *(GetMap()), nChildIndex ) );
-    if ( aCell.GetSwFrm()  )
+    if ( aCell.GetSwFrame()  )
     {
-        sal_Int32 nTop = aCell.GetSwFrm()->Frm().Top();
-        nTop -= GetFrm()->Frm().Top();
+        sal_Int32 nTop = aCell.GetSwFrame()->Frame().Top();
+        nTop -= GetFrame()->Frame().Top();
         Int32Set_Impl::const_iterator aRow(
                 GetTableData().GetRows().lower_bound( nTop ) );
         nRet = static_cast< sal_Int32 >( ::std::distance(
@@ -1332,10 +1332,10 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
     }
 
     SwAccessibleChild aCell( GetChild( *(GetMap()), nChildIndex ) );
-    if ( aCell.GetSwFrm()  )
+    if ( aCell.GetSwFrame()  )
     {
-        sal_Int32 nLeft = aCell.GetSwFrm()->Frm().Left();
-        nLeft -= GetFrm()->Frm().Left();
+        sal_Int32 nLeft = aCell.GetSwFrame()->Frame().Left();
+        nLeft -= GetFrame()->Frame().Left();
         Int32Set_Impl::const_iterator aCol(
                 GetTableData().GetColumns().lower_bound( nLeft ) );
         nRet = static_cast< sal_Int32 >( ::std::distance(
@@ -1388,7 +1388,7 @@ void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox )
         FireTableChangeEvent(*mpTableData);
     }
     if( HasTableData() )
-        GetTableData().SetTablePos( GetFrm()->Frm().Pos() );
+        GetTableData().SetTablePos( GetFrame()->Frame().Pos() );
 
     SwAccessibleContext::InvalidatePosOrSize( rOldBox );
 }
@@ -1403,13 +1403,13 @@ void SwAccessibleTable::Dispose( bool bRecursive )
     SwAccessibleContext::Dispose( bRecursive );
 }
 
-void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
+void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrameOrObj,
                                       bool bRecursive )
 {
     SolarMutexGuard aGuard;
 
-    const SwFrm *pFrm = rChildFrmOrObj.GetSwFrm();
-    OSL_ENSURE( pFrm, "frame expected" );
+    const SwFrame *pFrame = rChildFrameOrObj.GetSwFrame();
+    OSL_ENSURE( pFrame, "frame expected" );
     if( HasTableData() )
     {
         FireTableChangeEvent( GetTableData() );
@@ -1417,16 +1417,16 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
     }
 
     // There are two reason why this method has been called. The first one
-    // is there is no context for pFrm. The method is then called by
+    // is there is no context for pFrame. The method is then called by
     // the map, and we have to call our superclass.
     // The other situation is that we have been call by a call to get notified
     // about its change. We then must not call the superclass
-    uno::Reference< XAccessible > xAcc( GetMap()->GetContext( pFrm, false ) );
+    uno::Reference< XAccessible > xAcc( GetMap()->GetContext( pFrame, false ) );
     if( !xAcc.is() )
-        SwAccessibleContext::DisposeChild( rChildFrmOrObj, bRecursive );
+        SwAccessibleContext::DisposeChild( rChildFrameOrObj, bRecursive );
 }
 
-void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj,
+void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrameOrObj,
                                                   const SwRect& rOldBox )
 {
     SolarMutexGuard aGuard;
@@ -1434,7 +1434,7 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
     if( HasTableData() )
     {
         SAL_WARN_IF( HasTableData() &&
-                GetFrm()->Frm().Pos() != GetTableData().GetTablePos(), "sw.core",
+                GetFrame()->Frame().Pos() != GetTableData().GetTablePos(), "sw.core",
                 "table has invalid position" );
         if( HasTableData() )
         {
@@ -1446,12 +1446,12 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
                 {
                     Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) );
                     Int32Set_Impl::const_iterator aSttRow( GetTableData().GetRowIter( 1 ) );
-                    const SwFrm *pCellFrm = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, false );
+                    const SwFrame *pCellFrame = GetTableData().GetCellAtPos( *aSttCol, *aSttRow, false );
                     Int32Set_Impl::const_iterator aSttCol2( pNewTableData->GetColumnIter( 0 ) );
                     Int32Set_Impl::const_iterator aSttRow2( pNewTableData->GetRowIter( 0 ) );
-                    const SwFrm *pCellFrm2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, false );
+                    const SwFrame *pCellFrame2 = pNewTableData->GetCellAtPos( *aSttCol2, *aSttRow2, false );
 
-                    if(pCellFrm == pCellFrm2)
+                    if(pCellFrame == pCellFrame2)
                     {
                         AccessibleTableModelChange aModelChange;
                         aModelChange.Type = AccessibleTableModelChangeType::UPDATE;
@@ -1480,7 +1480,7 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
     }
 
     // #i013961# - always call super class method
-    SwAccessibleContext::InvalidateChildPosOrSize( rChildFrmOrObj, rOldBox );
+    SwAccessibleContext::InvalidateChildPosOrSize( rChildFrameOrObj, rOldBox );
 }
 
 // XAccessibleSelection
@@ -1499,8 +1499,8 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
     const SwTableBox* pBox = GetTableBox( nChildIndex );
     OSL_ENSURE( pBox != nullptr, "We need the table box." );
 
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell == nullptr )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell == nullptr )
         return;
 
     // assure, that child, identified by the given index, isn't already selected.
@@ -1515,7 +1515,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // if we have a selection in a table, check if it's in the
     // same table that we're trying to select in
-    const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTable();
+    const SwTableNode* pSelectedTable = pCursorShell->IsCursorInTable();
     if( pSelectedTable != nullptr )
     {
         // get top-most table line
@@ -1530,22 +1530,22 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
 
     // create the new selection
     const SwStartNode* pStartNode = pBox->GetSttNd();
-    if( pSelectedTable == nullptr || !pCrsrShell->GetTableCrs() )
+    if( pSelectedTable == nullptr || !pCursorShell->GetTableCrs() )
     {
-        pCrsrShell->StartAction();
+        pCursorShell->StartAction();
         // Set cursor into current cell. This deletes any table cursor.
         SwPaM aPaM( *pStartNode );
         aPaM.Move( fnMoveForward, fnGoNode );
         Select( aPaM );
         // Move cursor to the end of the table creating a selection and a table
         // cursor.
-        pCrsrShell->SetMark();
-        pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
+        pCursorShell->SetMark();
+        pCursorShell->MoveTable( fnTableCurr, fnTableEnd );
         // now set the cursor into the cell again.
-        SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
-                                                    : pCrsrShell->GetCrsr();
+        SwPaM *pPaM = pCursorShell->GetTableCrs() ? pCursorShell->GetTableCrs()
+                                                    : pCursorShell->GetCursor();
         *pPaM->GetPoint() = *pPaM->GetMark();
-        pCrsrShell->EndAction();
+        pCursorShell->EndAction();
         // we now have one cell selected!
     }
     else
@@ -1556,8 +1556,8 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
         SwPaM aPaM( *pStartNode );
         aPaM.Move( fnMoveForward, fnGoNode );
         aPaM.SetMark();
-        const SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
-                                                    : pCrsrShell->GetCrsr();
+        const SwPaM *pPaM = pCursorShell->GetTableCrs() ? pCursorShell->GetTableCrs()
+                                                    : pCursorShell->GetCursor();
         *(aPaM.GetMark()) = *pPaM->GetMark();
         Select( aPaM );
 
@@ -1585,12 +1585,12 @@ void SAL_CALL SwAccessibleTable::clearAccessibleSelection(  )
 
     CHECK_FOR_DEFUNC( XAccessibleTable );
 
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
-    if( pCrsrShell != nullptr )
+    SwCursorShell* pCursorShell = GetCursorShell();
+    if( pCursorShell != nullptr )
     {
-        pCrsrShell->StartAction();
-        pCrsrShell->ClearMark();
-        pCrsrShell->EndAction();
+        pCursorShell->StartAction();
+        pCursorShell->ClearMark();
+        pCursorShell->EndAction();
     }
 }
 
@@ -1656,10 +1656,10 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     SolarMutexGuard aGuard;
     CHECK_FOR_DEFUNC( XAccessibleTable );
 
-    SwCrsrShell* pCrsrShell = GetCrsrShell();
+    SwCursorShell* pCursorShell = GetCursorShell();
 
     // index has to be treated as global child index
-    if ( !pCrsrShell )
+    if ( !pCursorShell )
         throw lang::IndexOutOfBoundsException();
 
     // assure, that given child index is in bounds.
@@ -1676,33 +1676,33 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
     // If we unselect point, then set cursor to mark. If we clear another
     // selected box, then set cursor to point.
     // reduce selection to mark.
-    SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
-                                                : pCrsrShell->GetCrsr();
+    SwPaM *pPaM = pCursorShell->GetTableCrs() ? pCursorShell->GetTableCrs()
+                                                : pCursorShell->GetCursor();
     bool bDeselectPoint =
         pBox->GetSttNd() ==
             pPaM->GetPoint()->nNode.GetNode().FindTableBoxStartNode();
 
     SwPaM aPaM( bDeselectPoint ? *pPaM->GetMark() : *pPaM->GetPoint() );
 
-    pCrsrShell->StartAction();
+    pCursorShell->StartAction();
 
     // Set cursor into either point or mark
     Select( aPaM );
     // Move cursor to the end of the table creating a selection and a table
     // cursor.
-    pCrsrShell->SetMark();
-    pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
+    pCursorShell->SetMark();
+    pCursorShell->MoveTable( fnTableCurr, fnTableEnd );
     // now set the cursor into the cell again.
-    pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
-                                        : pCrsrShell->GetCrsr();
+    pPaM = pCursorShell->GetTableCrs() ? pCursorShell->GetTableCrs()
+                                        : pCursorShell->GetCursor();
     *pPaM->GetPoint() = *pPaM->GetMark();
-    pCrsrShell->EndAction();
+    pCursorShell->EndAction();
 }
 
 sal_Int32 SAL_CALL SwAccessibleTable::getBackground()
         throw (css::uno::RuntimeException, std::exception)
 {
-    const SvxBrushItem &rBack = GetFrm()->GetAttrSet()->GetBackground();
+    const SvxBrushItem &rBack = GetFrame()->GetAttrSet()->GetBackground();
     sal_uInt32 crBack = rBack.GetColor().GetColor();
 
     if (COL_AUTO == crBack)
@@ -1822,12 +1822,12 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row )
 
     if( isAccessibleSelected( row , 0 ) &&  isAccessibleSelected( row , getAccessibleColumnCount()-1 ) )
     {
-        SwCrsrShell* pCrsrShell = GetCrsrShell();
-        if( pCrsrShell != nullptr )
+        SwCursorShell* pCursorShell = GetCursorShell();
+        if( pCursorShell != nullptr )
         {
-            pCrsrShell->StartAction();
-            pCrsrShell->ClearMark();
-            pCrsrShell->EndAction();
+            pCursorShell->StartAction();
+            pCursorShell->ClearMark();
+            pCursorShell->EndAction();
             return sal_True;
         }
     }
@@ -1843,12 +1843,12 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column )
 
     if( isAccessibleSelected( 0 , column ) &&  isAccessibleSelected( getAccessibleRowCount()-1,column))
     {
-        SwCrsrShell* pCrsrShell = GetCrsrShell();
-        if( pCrsrShell != nullptr )
+        SwCursorShell* pCursorShell = GetCursorShell();
+        if( pCursorShell != nullptr )
         {
-            pCrsrShell->StartAction();
-            pCrsrShell->ClearMark();
-            pCrsrShell->EndAction();
+            pCursorShell->StartAction();
+            pCursorShell->ClearMark();
+            pCursorShell->EndAction();
             return sal_True;
         }
     }
@@ -1857,16 +1857,16 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column )
 
 // #i77106# - implementation of class <SwAccessibleTableColHeaders>
 SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2,
-                                                          const SwTabFrm *pTabFrm )
-    : SwAccessibleTable( pMap2, pTabFrm )
+                                                          const SwTabFrame *pTabFrame )
+    : SwAccessibleTable( pMap2, pTabFrame )
 {
     SolarMutexGuard aGuard;
 
-    const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+    const SwFrameFormat *pFrameFormat = pTabFrame->GetFormat();
     const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
     const OUString aName = pFrameFormat->GetName() + "-ColumnHeaders";
 
-    SetName( aName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+    SetName( aName + "-" + OUString::number( pTabFrame->GetPhyPageNum() ) );
 
     const OUString sArg2( GetFormattedPageNumber() );
 
@@ -1877,8 +1877,8 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2
 
 SwAccessibleTableData_Impl* SwAccessibleTableColHeaders::CreateNewTableData()
 {
-    const SwTabFrm* pTabFrm = static_cast<const SwTabFrm*>( GetFrm() );
-    return new SwAccessibleTableData_Impl( *(GetMap()), pTabFrm, IsInPagePreview(), true );
+    const SwTabFrame* pTabFrame = static_cast<const SwTabFrame*>( GetFrame() );
+    return new SwAccessibleTableData_Impl( *(GetMap()), pTabFrame, IsInPagePreview(), true );
 }
 
 void SwAccessibleTableColHeaders::Modify( const SfxPoolItem * /*pOld*/, const SfxPoolItem * /*pNew*/ )
@@ -1902,8 +1902,8 @@ sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount()
 
     sal_Int32 nCount = 0;
 
-    const SwTabFrm* pTabFrm = static_cast<const SwTabFrm*>( GetFrm() );
-    const SwAccessibleChildSList aVisList( GetVisArea(), *pTabFrm, *(GetMap()) );
+    const SwTabFrame* pTabFrame = static_cast<const SwTabFrame*>( GetFrame() );
+    const SwAccessibleChildSList aVisList( GetVisArea(), *pTabFrame, *(GetMap()) );
     SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
     while( aIter != aVisList.end() )
     {
@@ -1912,15 +1912,15 @@ sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount()
         {
             nCount++;
         }
-        else if( rLower.GetSwFrm() )
+        else if( rLower.GetSwFrame() )
         {
             // There are no unaccessible SdrObjects that count
-            if ( !rLower.GetSwFrm()->IsRowFrm() ||
-                 pTabFrm->IsInHeadline( *(rLower.GetSwFrm()) ) )
+            if ( !rLower.GetSwFrame()->IsRowFrame() ||
+                 pTabFrame->IsInHeadline( *(rLower.GetSwFrame()) ) )
             {
                 nCount += SwAccessibleFrame::GetChildCount( *(GetMap()),
                                                             GetVisArea(),
-                                                            rLower.GetSwFrm(),
+                                                            rLower.GetSwFrame(),
                                                             IsInPagePreview() );
             }
         }
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index b2f3800b44c1..8afd565b5c14 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -27,7 +27,7 @@
 
 #include <acccontext.hxx>
 
-class SwTabFrm;
+class SwTabFrame;
 class SwAccessibleTableData_Impl;
 class SwTableBox;
 class SwSelBoxes;
@@ -86,7 +86,7 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
 public:
-    SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm );
+    SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrame* pTableFrame );
 
     // XInterface
 
@@ -226,10 +226,10 @@ public:
     // The object is not visible an longer and should be destroyed
     virtual void Dispose( bool bRecursive = false ) override;
 
-    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj,
+    virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrameOrObj,
                                bool bRecursive ) override;
-    virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj,
-                                           const SwRect& rFrm ) override;
+    virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrameOrObj,
+                                           const SwRect& rFrame ) override;
 
     // XAccessibleSelection
 
@@ -292,7 +292,7 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
 public:
-    SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm );
+    SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrame *pTabFrame );
 
     // XInterface
 
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index ae2bc97feb5f..ac338185363d 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -45,13 +45,13 @@ using ::com::sun::star::accessibility::XAccessibleContext;
 
 SwAccessibleTextFrame::SwAccessibleTextFrame(
         SwAccessibleMap* pInitMap,
-        const SwFlyFrm& rFlyFrm  ) :
-    SwAccessibleFrameBase( pInitMap, AccessibleRole::TEXT_FRAME, &rFlyFrm ),
+        const SwFlyFrame& rFlyFrame  ) :
+    SwAccessibleFrameBase( pInitMap, AccessibleRole::TEXT_FRAME, &rFlyFrame ),
     msTitle(),
     msDesc()
 {
     const SwFlyFrameFormat* pFlyFrameFormat =
-                    dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() );
+                    dynamic_cast<const SwFlyFrameFormat*>( rFlyFrame.GetFormat() );
     msTitle = pFlyFrameFormat->GetObjTitle();
 
     msDesc = pFlyFrameFormat->GetObjDescription();
@@ -77,7 +77,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
         SwAccessibleFrameBase::Modify( pOld, pNew );
     }
 
-    const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( GetFrm() );
+    const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() );
     switch( nWhich )
     {
         // #i73249#
@@ -102,7 +102,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
             FireAccessibleEvent( aEvent );
 
             const SwFlyFrameFormat* pFlyFrameFormat =
-                            dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+                            dynamic_cast<const SwFlyFrameFormat*>( pFlyFrame->GetFormat() );
             if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty())
             {
                 break;
@@ -111,12 +111,12 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
         // intentionally no break here
         case RES_DESCRIPTION_CHANGED:
         {
-            if ( pFlyFrm )
+            if ( pFlyFrame )
             {
                 const OUString sOldDesc( msDesc );
 
                 const SwFlyFrameFormat* pFlyFrameFormat =
-                                dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+                                dynamic_cast<const SwFlyFrameFormat*>( pFlyFrame->GetFormat() );
                 const OUString& rDesc = pFlyFrameFormat->GetObjDescription();
                 msDesc = rDesc;
                 if ( msDesc.isEmpty() &&
@@ -305,23 +305,23 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId()
 
 // XAccessibleRelationSet
 
-SwFlyFrm* SwAccessibleTextFrame::getFlyFrm() const
+SwFlyFrame* SwAccessibleTextFrame::getFlyFrame() const
 {
-    SwFlyFrm* pFlyFrm = nullptr;
+    SwFlyFrame* pFlyFrame = nullptr;
 
-    const SwFrm* pFrm = GetFrm();
-    assert(pFrm);
-    if( pFrm->IsFlyFrm() )
+    const SwFrame* pFrame = GetFrame();
+    assert(pFrame);
+    if( pFrame->IsFlyFrame() )
     {
-        pFlyFrm = static_cast<SwFlyFrm*>( const_cast<SwFrm*>( pFrm ) );
+        pFlyFrame = static_cast<SwFlyFrame*>( const_cast<SwFrame*>( pFrame ) );
     }
 
-    return pFlyFrm;
+    return pFlyFrame;
 }
 
-AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const SwFlyFrm* pFrm )
+AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const SwFlyFrame* pFrame )
 {
-    uno::Sequence<uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pFrm ) };
+    uno::Sequence<uno::Reference<XInterface> > aSequence { GetMap()->GetContext( pFrame ) };
     return AccessibleRelation( nType, aSequence );
 }
 
@@ -335,18 +335,18 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccess
 
     AccessibleRelationSetHelper* pHelper = new AccessibleRelationSetHelper();
 
-    SwFlyFrm* pFlyFrm = getFlyFrm();
-    assert(pFlyFrm);
+    SwFlyFrame* pFlyFrame = getFlyFrame();
+    assert(pFlyFrame);
 
-    const SwFlyFrm* pPrevFrm = pFlyFrm->GetPrevLink();
-    if( pPrevFrm != nullptr )
+    const SwFlyFrame* pPrevFrame = pFlyFrame->GetPrevLink();
+    if( pPrevFrame != nullptr )
         pHelper->AddRelation( makeRelation(
-            AccessibleRelationType::CONTENT_FLOWS_FROM, pPrevFrm ) );
+            AccessibleRelationType::CONTENT_FLOWS_FROM, pPrevFrame ) );
 
-    const SwFlyFrm* pNextFrm = pFlyFrm->GetNextLink();
-    if( pNextFrm != nullptr )
+    const SwFlyFrame* pNextFrame = pFlyFrame->GetNextLink();
+    if( pNextFrame != nullptr )
         pHelper->AddRelation( makeRelation(
-            AccessibleRelationType::CONTENT_FLOWS_TO, pNextFrm ) );
+            AccessibleRelationType::CONTENT_FLOWS_TO, pNextFrame ) );
 
     return pHelper;
 }
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index d276c65656e2..f5420c979753 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
-class SwFlyFrm;
+class SwFlyFrame;
 namespace utl { class AccessibleRelationSetHelper; }
 namespace com { namespace star {
     namespace accessibility { struct AccessibleRelation; }
@@ -43,7 +43,7 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
 public:
-    SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm& rFlyFrm );
+    SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrame& rFlyFrame );
 
     virtual css::uno::Any SAL_CALL queryInterface(
         css::uno::Type const & rType )
@@ -122,10 +122,10 @@ public:
 
 private:
     // helper methods for getAccessibleRelationSet:
-    SwFlyFrm* getFlyFrm() const;
+    SwFlyFrame* getFlyFrame() const;
 
     css::accessibility::AccessibleRelation makeRelation(
-        sal_Int16 nType, const SwFlyFrm* pFrm );
+        sal_Int16 nType, const SwFlyFrame* pFrame );
 
 public:
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet()
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index 3ab9b8a5d593..938d77975632 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -31,7 +31,7 @@
 #include <algorithm>
 
 namespace {
-    void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm,
+    void initChangeTrackTextMarkupLists( const SwTextFrame& rTextFrame,
                                          SwWrongList*& opChangeTrackInsertionTextMarkupList,
                                          SwWrongList*& opChangeTrackDeletionTextMarkupList,
                                          SwWrongList*& opChangeTrackFormatChangeTextMarkupList )
@@ -40,12 +40,12 @@ namespace {
         opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
         opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
 
-        if ( !rTextFrm.GetTextNode() )
+        if ( !rTextFrame.GetTextNode() )
         {
             OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" );
             return;
         }
-        const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) );
+        const SwTextNode& rTextNode( *(rTextFrame.GetTextNode()) );
 
         const IDocumentRedlineAccess& rIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() );
 
@@ -64,12 +64,12 @@ namespace {
             return;
         }
 
-        const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow()
-                                               ? rTextFrm.GetOfst()
+        const sal_Int32 nTextFrameTextStartPos = rTextFrame.IsFollow()
+                                               ? rTextFrame.GetOfst()
                                                : 0;
-        const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow()
-                                             ? rTextFrm.GetFollow()->GetOfst()
-                                             : rTextFrm.GetText().getLength();
+        const sal_Int32 nTextFrameTextEndPos = rTextFrame.HasFollow()
+                                             ? rTextFrame.GetFollow()->GetOfst()
+                                             : rTextFrame.GetText().getLength();
 
         // iteration over the redlines which overlap with the text node.
         const SwRedlineTable& rRedlineTable = rIDocChangeTrack.GetRedlineTable();
@@ -89,8 +89,8 @@ namespace {
             pActRedline->CalcStartEnd( rTextNode.GetIndex(),
                                        nTextNodeChangeTrackStart,
                                        nTextNodeChangeTrackEnd );
-            if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos ||
-                 nTextNodeChangeTrackEnd < nTextFrmTextStartPos )
+            if ( nTextNodeChangeTrackStart > nTextFrameTextEndPos ||
+                 nTextNodeChangeTrackEnd < nTextFrameTextStartPos )
             {
                 // Consider only redlines which overlap with the text frame's text.
                 continue;
@@ -121,23 +121,23 @@ namespace {
             }
             if ( pMarkupList )
             {
-                const sal_Int32 nTextFrmChangeTrackStart =
-                    std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos);
+                const sal_Int32 nTextFrameChangeTrackStart =
+                    std::max(nTextNodeChangeTrackStart, nTextFrameTextStartPos);
 
-                const sal_Int32 nTextFrmChangeTrackEnd =
-                    std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos);
+                const sal_Int32 nTextFrameChangeTrackEnd =
+                    std::min(nTextNodeChangeTrackEnd, nTextFrameTextEndPos);
 
                 pMarkupList->Insert( OUString(), nullptr,
-                                     nTextFrmChangeTrackStart,
-                                     nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart,
+                                     nTextFrameChangeTrackStart,
+                                     nTextFrameChangeTrackEnd - nTextFrameChangeTrackStart,
                                      pMarkupList->Count() );
             }
         } // eof iteration over the redlines which overlap with the text node
     }
 } // eof anonymous namespace
 
-SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm )
-    : mrTextFrm( rTextFrm )
+SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrame& rTextFrame )
+    : mrTextFrame( rTextFrame )
     , mpChangeTrackInsertionTextMarkupList( nullptr )
     , mpChangeTrackDeletionTextMarkupList( nullptr )
     , mpChangeTrackFormatChangeTextMarkupList( nullptr )
@@ -171,7 +171,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
         OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == nullptr,
                 "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
-        initChangeTrackTextMarkupLists( mrTextFrm,
+        initChangeTrackTextMarkupLists( mrTextFrame,
                                         mpChangeTrackInsertionTextMarkupList,
                                         mpChangeTrackDeletionTextMarkupList,
                                         mpChangeTrackFormatChangeTextMarkupList );
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index d25a50ca0726..4a83beedc5d5 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -22,13 +22,13 @@
 
 #include <sal/types.h>
 
-class SwTextFrm;
+class SwTextFrame;
 class SwWrongList;
 
 class SwParaChangeTrackingInfo
 {
     public:
-        explicit SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm );
+        explicit SwParaChangeTrackingInfo( const SwTextFrame& rTextFrame );
         ~SwParaChangeTrackingInfo();
 
         void reset();
@@ -39,7 +39,7 @@ class SwParaChangeTrackingInfo
         SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) = delete;
         SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) = delete;
 
-        const SwTextFrm& mrTextFrm;
+        const SwTextFrame& mrTextFrame;
 
         SwWrongList* mpChangeTrackInsertionTextMarkupList;
         SwWrongList* mpChangeTrackDeletionTextMarkupList;
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index e98cd5cac8ca..8c671de14cee 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -91,7 +91,7 @@ SwModify::~SwModify()
     OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
 
     if ( IsInCache() )
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
 
     if ( IsInSwFntCache() )
         pSwFontCache->Delete( this );
@@ -258,7 +258,7 @@ void SwModify::CheckCaching( const sal_uInt16 nWhich )
         case RES_BREAK:
             if( IsInCache() )
             {
-                SwFrm::GetCache().Delete( this );
+                SwFrame::GetCache().Delete( this );
                 SetInCache( false );
             }
             break;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 1c86b77d92e2..d350b3278519 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -40,9 +40,9 @@ using namespace com::sun::star;
 
 
 SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
-              const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
+              const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame,
               sal_uInt16 nFormatWhich )
-    : SwModify( pDrvdFrm ),
+    : SwModify( pDrvdFrame ),
     m_aFormatName( OUString::createFromAscii(pFormatNm) ),
     m_aSet( rPool, pWhichRanges ),
     m_nWhichId( nFormatWhich ),
@@ -54,14 +54,14 @@ SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
     m_bAutoFormat = true;
     m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
-    if( pDrvdFrm )
-        m_aSet.SetParent( &pDrvdFrm->m_aSet );
+    if( pDrvdFrame )
+        m_aSet.SetParent( &pDrvdFrame->m_aSet );
 }
 
 SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm,
-              const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrm,
+              const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrame,
               sal_uInt16 nFormatWhich )
-    : SwModify( pDrvdFrm ),
+    : SwModify( pDrvdFrame ),
     m_aFormatName( rFormatNm ),
     m_aSet( rPool, pWhichRanges ),
     m_nWhichId( nFormatWhich ),
@@ -73,8 +73,8 @@ SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm,
     m_bAutoFormat = true;
     m_bWritten = m_bFormatInDTOR = m_bHidden = false;
 
-    if( pDrvdFrm )
-        m_aSet.SetParent( &pDrvdFrm->m_aSet );
+    if( pDrvdFrame )
+        m_aSet.SetParent( &pDrvdFrame->m_aSet );
 }
 
 SwFormat::SwFormat( const SwFormat& rFormat )
@@ -106,7 +106,7 @@ SwFormat &SwFormat::operator=(const SwFormat& rFormat)
 
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
@@ -180,7 +180,7 @@ void SwFormat::CopyAttrs( const SwFormat& rFormat, bool bReplace )
     // copy only array with attributes delta
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
@@ -376,7 +376,7 @@ bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom)
 
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
@@ -571,7 +571,7 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
 
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
@@ -707,7 +707,7 @@ sal_uInt16 SwFormat::ResetAllFormatAttr()
 
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
@@ -740,7 +740,7 @@ void SwFormat::DelDiffs( const SfxItemSet& rSet )
 
     if ( IsInCache() )
     {
-        SwFrm::GetCache().Delete( this );
+        SwFrame::GetCache().Delete( this );
         SetInCache( false );
     }
     SetInSwFntCache( false );
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 04176ba1e703..32f92d7bf444 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -144,8 +144,8 @@ SwCondCollCondChg::SwCondCollCondChg( SwFormat *pFormat )
 {
 }
 
-SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrm *pPg ) :
-    SwMsgPoolItem( RES_VIRTPAGENUM_INFO ), m_pPage( nullptr ), m_pOrigPage( pPg ), m_pFrm( nullptr )
+SwVirtPageNumInfo::SwVirtPageNumInfo( const SwPageFrame *pPg ) :
+    SwMsgPoolItem( RES_VIRTPAGENUM_INFO ), m_pPage( nullptr ), m_pOrigPage( pPg ), m_pFrame( nullptr )
 {
 }
 
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 7864657a54e0..f03a943cc74f 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -629,18 +629,18 @@ void SwCalc::VarChange( const OUString& rStr, const SwSbxValue& rValue )
 
 bool SwCalc::Push( const SwUserFieldType* pUserFieldType )
 {
-    if( aRekurStk.end() != std::find(aRekurStk.begin(), aRekurStk.end(), pUserFieldType ) )
+    if( aRekurStack.end() != std::find(aRekurStack.begin(), aRekurStack.end(), pUserFieldType ) )
         return false;
 
-    aRekurStk.push_back( pUserFieldType );
+    aRekurStack.push_back( pUserFieldType );
     return true;
 }
 
 void SwCalc::Pop()
 {
-    OSL_ENSURE( aRekurStk.size(), "SwCalc: Pop on an invalid pointer" );
+    OSL_ENSURE( aRekurStack.size(), "SwCalc: Pop on an invalid pointer" );
 
-    aRekurStk.pop_back();
+    aRekurStack.pop_back();
 }
 
 SwCalcOper SwCalc::GetToken()
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 35c59bffc556..f82193b32177 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -573,7 +573,7 @@ void _InitCore()
     aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true );
 
     aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] =            new SwFormatFillOrder;
-    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFormatFrmSize;
+    aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] =              new SwFormatFrameSize;
     aAttrTab[ RES_PAPER_BIN- POOLATTR_BEGIN ] =             new SvxPaperBinItem( RES_PAPER_BIN );
     aAttrTab[ RES_LR_SPACE- POOLATTR_BEGIN ] =              new SvxLRSpaceItem( RES_LR_SPACE );
     aAttrTab[ RES_UL_SPACE- POOLATTR_BEGIN ] =              new SvxULSpaceItem( RES_UL_SPACE );
@@ -733,7 +733,7 @@ void _InitCore()
     SwBreakIt::_Create( ::comphelper::getProcessComponentContext() );
     pCheckIt = nullptr;
 
-    _FrmInit();
+    _FrameInit();
     _TextInit();
 
     SwSelPaintRects::s_pMapMode = new MapMode;
@@ -755,7 +755,7 @@ void _InitCore()
 
 void _FinitCore()
 {
-    _FrmFinit();
+    _FrameFinit();
     _TextFinit();
 
     sw::proofreadingiterator::dispose();
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 0910dd967beb..8446e63ddb42 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -57,22 +57,22 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoDelete )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCursor )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrame )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrame )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat )
 IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat )
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx
index e8a21ccdb74c..89c8d8f745fe 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -26,7 +26,7 @@ SwBlockCursor::~SwBlockCursor()
     delete pEndPt;
 }
 
-SwShellCrsr& SwBlockCursor::getShellCrsr()
+SwShellCursor& SwBlockCursor::getShellCursor()
 {
     return aCursor;
 }
diff --git a/sw/source/core/crsr/BlockCursor.hxx b/sw/source/core/crsr/BlockCursor.hxx
index a68b1117cc51..3238993c87cd 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.hxx
@@ -21,34 +21,34 @@
 
 #include <crsrsh.hxx>
 
-class SwCrsrShell;
+class SwCursorShell;
 struct SwPosition;
 class Point;
 
  /** Access to the block cursor
 
-    A block cursor contains a SwShellCrsr and additional information about
+    A block cursor contains a SwShellCursor and additional information about
     the rectangle which has been created by pressing the mouse button and
     moving the mouse.
 
-    It's simply an aggregation of a SwShellCrsr and a rectangle defined by
+    It's simply an aggregation of a SwShellCursor and a rectangle defined by
     a start and an end point.
 */
 class SwBlockCursor
 {
-    SwShellCrsr aCursor;
+    SwShellCursor aCursor;
     Point *pStartPt;
     Point *pEndPt;
 
 public:
-    SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) :
-        aCursor( rCrsrSh, rPos ), pStartPt(nullptr), pEndPt(nullptr) {}
+    SwBlockCursor( const SwCursorShell& rCursorSh, const SwPosition &rPos ) :
+        aCursor( rCursorSh, rPos ), pStartPt(nullptr), pEndPt(nullptr) {}
     /** Access to the shell cursor
 
-        @return SwShellCrsr& which represents the start and end position of the
+        @return SwShellCursor& which represents the start and end position of the
         current block selection
     */
-    SwShellCrsr& getShellCrsr();
+    SwShellCursor& getShellCursor();
     /** Defines the starting vertex of the block selection
 
         @param rPt
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index f24c6fb9f3a5..e93a6c9d7014 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -36,31 +36,31 @@
 #include <breakit.hxx>
 #include <vcl/window.hxx>
 
-SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
+SwCallLink::SwCallLink( SwCursorShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                         sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection )
     : rShell( rSh ), nNode( nAktNode ), nContent( nAktContent ),
-      nNdTyp( nAktNdTyp ), nLeftFrmPos( nLRPos ),
+      nNdTyp( nAktNdTyp ), nLeftFramePos( nLRPos ),
       bHasSelection( bAktSelection )
 {
 }
 
-SwCallLink::SwCallLink( SwCrsrShell & rSh )
+SwCallLink::SwCallLink( SwCursorShell & rSh )
     : rShell( rSh )
 {
     // remember SPoint-values of current cursor
-    SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
-    SwNode& rNd = pCrsr->GetPoint()->nNode.GetNode();
+    SwPaM* pCursor = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCursor();
+    SwNode& rNd = pCursor->GetPoint()->nNode.GetNode();
     nNode = rNd.GetIndex();
-    nContent = pCrsr->GetPoint()->nContent.GetIndex();
+    nContent = pCursor->GetPoint()->nContent.GetIndex();
     nNdTyp = rNd.GetNodeType();
-    bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
+    bHasSelection = ( *pCursor->GetPoint() != *pCursor->GetMark() );
 
     if( rNd.IsTextNode() )
-        nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTextNode(), nContent,
+        nLeftFramePos = SwCallLink::getLayoutFrame( rShell.GetLayout(), *rNd.GetTextNode(), nContent,
                                             !rShell.ActionPend() );
     else
     {
-        nLeftFrmPos = 0;
+        nLeftFramePos = 0;
 
         // A special treatment for SwFeShell:
         // When deleting the header/footer, footnotes SwFeShell sets the
@@ -72,30 +72,30 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
     }
 }
 
-static void lcl_notifyRow(const SwContentNode* pNode, SwCrsrShell& rShell)
+static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell& rShell)
 {
     if ( !pNode )
         return;
 
-    SwFrm *const pMyFrm = pNode->getLayoutFrm( rShell.GetLayout() );
-    if ( !pMyFrm )
+    SwFrame *const pMyFrame = pNode->getLayoutFrame( rShell.GetLayout() );
+    if ( !pMyFrame )
         return;
 
     // We need to emulated a change of the row height in order
     // to have the complete row redrawn
-    SwRowFrm *const pRow = pMyFrm->FindRowFrm();
+    SwRowFrame *const pRow = pMyFrame->FindRowFrame();
     if ( !pRow )
         return;
 
     const SwTableLine* pLine = pRow->GetTabLine( );
     // Avoid redrawing the complete row if there are no nested tables
-    for (SwFrm *pCell = pRow->GetLower(); pCell; pCell = pCell->GetNext())
+    for (SwFrame *pCell = pRow->GetLower(); pCell; pCell = pCell->GetNext())
     {
-        for (SwFrm *pContent = pCell->GetLower(); pContent; pContent = pContent->GetNext())
+        for (SwFrame *pContent = pCell->GetLower(); pContent; pContent = pContent->GetNext())
         {
             if (pContent->GetType() == FRM_TAB)
             {
-                SwFormatFrmSize pSize = pLine->GetFrameFormat()->GetFrmSize();
+                SwFormatFrameSize pSize = pLine->GetFrameFormat()->GetFrameSize();
                 pRow->ModifyNotification(nullptr, &pSize);
                 return;
             }
@@ -110,8 +110,8 @@ SwCallLink::~SwCallLink()
 
     // If travelling over Nodes check formats and register them anew at the
     // new Node.
-    SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
-    SwContentNode * pCNd = pCurCrsr->GetContentNode();
+    SwPaM* pCurrentCursor = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCursor();
+    SwContentNode * pCNd = pCurrentCursor->GetContentNode();
     if( !pCNd )
         return;
 
@@ -125,9 +125,9 @@ SwCallLink::~SwCallLink()
     }
     lcl_notifyRow(pNode, rShell);
 
-    sal_Int32 nCmp, nAktContent = pCurCrsr->GetPoint()->nContent.GetIndex();
+    sal_Int32 nCmp, nAktContent = pCurrentCursor->GetPoint()->nContent.GetIndex();
     sal_uInt16 nNdWhich = pCNd->GetNodeType();
-    sal_uLong nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex();
+    sal_uLong nAktNode = pCurrentCursor->GetPoint()->nNode.GetIndex();
 
     // Register the Shell as dependent at the current Node. By doing this all
     // attribute changes can be signaled over the link.
@@ -141,7 +141,7 @@ SwCallLink::~SwCallLink()
         // That can be done in one go by the handler.
         rShell.CallChgLnk();
     }
-    else if( !bHasSelection != !(*pCurCrsr->GetPoint() != *pCurCrsr->GetMark()) )
+    else if( !bHasSelection != !(*pCurrentCursor->GetPoint() != *pCurrentCursor->GetMark()) )
     {
         // always call change link when selection changes
         rShell.CallChgLnk();
@@ -151,12 +151,12 @@ SwCallLink::~SwCallLink()
     {
         // If travelling with left/right only and the frame is
         // unchanged (columns!) then check text hints.
-        if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTextNode(), nAktContent,
+        if( nLeftFramePos == SwCallLink::getLayoutFrame( rShell.GetLayout(), *pCNd->GetTextNode(), nAktContent,
                                                     !rShell.ActionPend() ) &&
             (( nCmp = nContent ) + 1 == nAktContent ||          // Right
             nContent -1 == ( nCmp = nAktContent )) )            // Left
         {
-            if( nCmp == nAktContent && pCurCrsr->HasMark() ) // left & select
+            if( nCmp == nAktContent && pCurrentCursor->HasMark() ) // left & select
                 ++nCmp;
 
             if ( pCNd->GetTextNode()->HasHints() )
@@ -210,12 +210,12 @@ SwCallLink::~SwCallLink()
             rShell.CallChgLnk();
     }
 
-    const SwFrm* pFrm;
-    const SwFlyFrm *pFlyFrm;
-    if( !rShell.ActionPend() && nullptr != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(), nullptr, nullptr, false) ) &&
-        nullptr != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
+    const SwFrame* pFrame;
+    const SwFlyFrame *pFlyFrame;
+    if( !rShell.ActionPend() && nullptr != ( pFrame = pCNd->getLayoutFrame(rShell.GetLayout(), nullptr, nullptr, false) ) &&
+        nullptr != ( pFlyFrame = pFrame->FindFlyFrame() ) && !rShell.IsTableMode() )
     {
-        const SwNodeIndex* pIndex = pFlyFrm->GetFormat()->GetContent().GetContentIdx();
+        const SwNodeIndex* pIndex = pFlyFrame->GetFormat()->GetContent().GetContentIdx();
         OSL_ENSURE( pIndex, "Fly without Content" );
 
         if (!pIndex)
@@ -225,22 +225,22 @@ SwCallLink::~SwCallLink()
 
         if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
             nNode > rStNd.EndOfSectionIndex() )
-            rShell.GetFlyMacroLnk().Call( pFlyFrm->GetFormat() );
+            rShell.GetFlyMacroLnk().Call( pFlyFrame->GetFormat() );
     }
 }
 
-long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
+long SwCallLink::getLayoutFrame( const SwRootFrame* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrame )
 {
-    SwTextFrm* pFrm = static_cast<SwTextFrm*>(rNd.getLayoutFrm(pRoot,nullptr,nullptr,bCalcFrm));
-    SwTextFrm* pNext;
-    if ( pFrm && !pFrm->IsHiddenNow() )
+    SwTextFrame* pFrame = static_cast<SwTextFrame*>(rNd.getLayoutFrame(pRoot,nullptr,nullptr,bCalcFrame));
+    SwTextFrame* pNext;
+    if ( pFrame && !pFrame->IsHiddenNow() )
     {
-        if( pFrm->HasFollow() )
-            while( nullptr != ( pNext = pFrm->GetFollow() ) &&
+        if( pFrame->HasFollow() )
+            while( nullptr != ( pNext = pFrame->GetFollow() ) &&
                     nCntPos >= pNext->GetOfst() )
-                pFrm = pNext;
+                pFrame = pNext;
 
-        return pFrm->Frm().Left();
+        return pFrame->Frame().Left();
     }
     return 0;
 }
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index b0aebe7aa21b..d2a7b4df4643 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -22,27 +22,27 @@
 
 #include <tools/solar.h>
 
-class SwCrsrShell;
+class SwCursorShell;
 class SwTextNode;
-class SwRootFrm;
+class SwRootFrame;
 
 class SwCallLink
 {
 public:
-    SwCrsrShell & rShell;
+    SwCursorShell & rShell;
     sal_uLong nNode;
     sal_Int32 nContent;
     sal_uInt8 nNdTyp;
-    long nLeftFrmPos;
+    long nLeftFramePos;
     bool bHasSelection;
 
-    explicit SwCallLink( SwCrsrShell & rSh );
-    SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
+    explicit SwCallLink( SwCursorShell & rSh );
+    SwCallLink( SwCursorShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
                                     sal_uInt8 nAktNdTyp, long nLRPos,
                                     bool bAktSelection );
     ~SwCallLink();
 
-    static long getLayoutFrm( const SwRootFrm*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
+    static long getLayoutFrame( const SwRootFrame*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrame );
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 8b55c24d62e9..91b6f3f10617 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -30,40 +30,40 @@ using namespace std;
 
 namespace
 {
-    struct CrsrStateHelper
+    struct CursorStateHelper
     {
-        explicit CrsrStateHelper(SwCrsrShell& rShell)
+        explicit CursorStateHelper(SwCursorShell& rShell)
             : m_aLink(rShell)
-            , m_pCrsr(rShell.GetSwCrsr())
-            , m_aSaveState(*m_pCrsr)
+            , m_pCursor(rShell.GetSwCursor())
+            , m_aSaveState(*m_pCursor)
         { }
 
-        void SetCrsrToMark(::sw::mark::IMark const * const pMark)
+        void SetCursorToMark(::sw::mark::IMark const * const pMark)
         {
-            *(m_pCrsr->GetPoint()) = pMark->GetMarkStart();
+            *(m_pCursor->GetPoint()) = pMark->GetMarkStart();
             if(pMark->IsExpanded())
             {
-                m_pCrsr->SetMark();
-                *(m_pCrsr->GetMark()) = pMark->GetMarkEnd();
+                m_pCursor->SetMark();
+                *(m_pCursor->GetMark()) = pMark->GetMarkEnd();
             }
         }
 
         /// returns true if the Cursor had been rolled back
         bool RollbackIfIllegal()
         {
-            if(m_pCrsr->IsSelOvr(nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION
+            if(m_pCursor->IsSelOvr(nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION
                 | nsSwCursorSelOverFlags::SELOVER_TOGGLE))
             {
-                m_pCrsr->DeleteMark();
-                m_pCrsr->RestoreSavePos();
+                m_pCursor->DeleteMark();
+                m_pCursor->RestoreSavePos();
                 return true;
             }
             return false;
         }
 
         SwCallLink m_aLink;
-        SwCursor* m_pCrsr;
-        SwCrsrSaveState m_aSaveState;
+        SwCursor* m_pCursor;
+        SwCursorSaveState m_aSaveState;
     };
 
     static bool lcl_ReverseMarkOrderingByEnd(const IDocumentMarkAccess::pMark_t& rpFirst,
@@ -78,8 +78,8 @@ namespace
     }
 }
 
-// at CurCrsr.SPoint
-::sw::mark::IMark* SwCrsrShell::SetBookmark(
+// at CurrentCursor.SPoint
+::sw::mark::IMark* SwCursorShell::SetBookmark(
     const vcl::KeyCode& rCode,
     const OUString& rName,
     const OUString& rShortName,
@@ -87,7 +87,7 @@ namespace
 {
     StartAction();
     ::sw::mark::IMark* pMark = getIDocumentMarkAccess()->makeMark(
-        *GetCrsr(),
+        *GetCursor(),
         rName,
         eMark);
     ::sw::mark::IBookmark* pBookmark = dynamic_cast< ::sw::mark::IBookmark* >(pMark);
@@ -99,36 +99,36 @@ namespace
     EndAction();
     return pMark;
 }
-// set CurCrsr.SPoint
+// set CurrentCursor.SPoint
 
-bool SwCrsrShell::GotoMark(const ::sw::mark::IMark* const pMark, bool bAtStart)
+bool SwCursorShell::GotoMark(const ::sw::mark::IMark* const pMark, bool bAtStart)
 {
-    // watch Crsr-Moves
-    CrsrStateHelper aCrsrSt(*this);
+    // watch Cursor-Moves
+    CursorStateHelper aCursorSt(*this);
     if ( bAtStart )
-        *(aCrsrSt.m_pCrsr)->GetPoint() = pMark->GetMarkStart();
+        *(aCursorSt.m_pCursor)->GetPoint() = pMark->GetMarkStart();
     else
-        *(aCrsrSt.m_pCrsr)->GetPoint() = pMark->GetMarkEnd();
+        *(aCursorSt.m_pCursor)->GetPoint() = pMark->GetMarkEnd();
 
-    if(aCrsrSt.RollbackIfIllegal()) return false;
+    if(aCursorSt.RollbackIfIllegal()) return false;
 
-    UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+    UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return true;
 }
 
-bool SwCrsrShell::GotoMark(const ::sw::mark::IMark* const pMark)
+bool SwCursorShell::GotoMark(const ::sw::mark::IMark* const pMark)
 {
-    // watch Crsr-Moves
-    CrsrStateHelper aCrsrSt(*this);
-    aCrsrSt.SetCrsrToMark(pMark);
+    // watch Cursor-Moves
+    CursorStateHelper aCursorSt(*this);
+    aCursorSt.SetCursorToMark(pMark);
 
-    if(aCrsrSt.RollbackIfIllegal()) return false;
+    if(aCursorSt.RollbackIfIllegal()) return false;
 
-    UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+    UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return true;
 }
 
-bool SwCrsrShell::GoNextBookmark()
+bool SwCursorShell::GoNextBookmark()
 {
     IDocumentMarkAccess* pMarkAccess = getIDocumentMarkAccess();
     IDocumentMarkAccess::container_t vCandidates;
@@ -136,19 +136,19 @@ bool SwCrsrShell::GoNextBookmark()
         upper_bound( // finds the first that is starting after
             pMarkAccess->getBookmarksBegin(),
             pMarkAccess->getBookmarksEnd(),
-            *GetCrsr()->GetPoint(),
+            *GetCursor()->GetPoint(),
             sw::mark::CompareIMarkStartsAfter()),
         pMarkAccess->getBookmarksEnd(),
         back_inserter(vCandidates),
         &lcl_IsInvisibleBookmark);
 
-    // watch Crsr-Moves
-    CrsrStateHelper aCrsrSt(*this);
+    // watch Cursor-Moves
+    CursorStateHelper aCursorSt(*this);
     IDocumentMarkAccess::const_iterator_t ppMark = vCandidates.begin();
     for(; ppMark!=vCandidates.end(); ++ppMark)
     {
-        aCrsrSt.SetCrsrToMark(ppMark->get());
-        if(!aCrsrSt.RollbackIfIllegal())
+        aCursorSt.SetCursorToMark(ppMark->get());
+        if(!aCursorSt.RollbackIfIllegal())
             break; // found legal move
     }
     if(ppMark==vCandidates.end())
@@ -157,11 +157,11 @@ bool SwCrsrShell::GoNextBookmark()
         return false;
     }
 
-    UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+    UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return true;
 }
 
-bool SwCrsrShell::GoPrevBookmark()
+bool SwCursorShell::GoPrevBookmark()
 {
     IDocumentMarkAccess* pMarkAccess = getIDocumentMarkAccess();
     // candidates from which to choose the mark before
@@ -172,7 +172,7 @@ bool SwCrsrShell::GoPrevBookmark()
         upper_bound(
             pMarkAccess->getBookmarksBegin(),
             pMarkAccess->getBookmarksEnd(),
-            *GetCrsr()->GetPoint(),
+            *GetCursor()->GetPoint(),
             sw::mark::CompareIMarkStartsAfter()),
         back_inserter(vCandidates),
         &lcl_IsInvisibleBookmark);
@@ -181,19 +181,19 @@ bool SwCrsrShell::GoPrevBookmark()
         vCandidates.end(),
         &lcl_ReverseMarkOrderingByEnd);
 
-    // watch Crsr-Moves
-    CrsrStateHelper aCrsrSt(*this);
+    // watch Cursor-Moves
+    CursorStateHelper aCursorSt(*this);
     IDocumentMarkAccess::const_iterator_t ppMark = vCandidates.begin();
     for(; ppMark!=vCandidates.end(); ++ppMark)
     {
-        // ignoring those not ending before the Crsr
+        // ignoring those not ending before the Cursor
         // (we were only able to eliminate those starting
-        // behind the Crsr by the upper_bound(..)
+        // behind the Cursor by the upper_bound(..)
         // above)
-        if(!(**ppMark).EndsBefore(*GetCrsr()->GetPoint()))
+        if(!(**ppMark).EndsBefore(*GetCursor()->GetPoint()))
             continue;
-        aCrsrSt.SetCrsrToMark(ppMark->get());
-        if(!aCrsrSt.RollbackIfIllegal())
+        aCursorSt.SetCursorToMark(ppMark->get());
+        if(!aCursorSt.RollbackIfIllegal())
             break; // found legal move
     }
     if(ppMark==vCandidates.end())
@@ -202,47 +202,47 @@ bool SwCrsrShell::GoPrevBookmark()
         return false;
     }
 
-    UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+    UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return true;
 }
 
-bool SwCrsrShell::IsFormProtected()
+bool SwCursorShell::IsFormProtected()
 {
     return getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_FORM);
 }
 
-::sw::mark::IFieldmark* SwCrsrShell::GetCurrentFieldmark()
+::sw::mark::IFieldmark* SwCursorShell::GetCurrentFieldmark()
 {
     // TODO: Refactor
-    SwPosition pos(*GetCrsr()->GetPoint());
+    SwPosition pos(*GetCursor()->GetPoint());
     return getIDocumentMarkAccess()->getFieldmarkFor(pos);
 }
 
-::sw::mark::IFieldmark* SwCrsrShell::GetFieldmarkAfter()
+::sw::mark::IFieldmark* SwCursorShell::GetFieldmarkAfter()
 {
-    SwPosition pos(*GetCrsr()->GetPoint());
+    SwPosition pos(*GetCursor()->GetPoint());
     return getIDocumentMarkAccess()->getFieldmarkAfter(pos);
 }
 
-::sw::mark::IFieldmark* SwCrsrShell::GetFieldmarkBefore()
+::sw::mark::IFieldmark* SwCursorShell::GetFieldmarkBefore()
 {
-    SwPosition pos(*GetCrsr()->GetPoint());
+    SwPosition pos(*GetCursor()->GetPoint());
     return getIDocumentMarkAccess()->getFieldmarkBefore(pos);
 }
 
-bool SwCrsrShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
+bool SwCursorShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
 {
     if(pMark==nullptr) return false;
 
-    // watch Crsr-Moves
-    CrsrStateHelper aCrsrSt(*this);
-    aCrsrSt.SetCrsrToMark(pMark);
-    ++aCrsrSt.m_pCrsr->GetPoint()->nContent;
-    --aCrsrSt.m_pCrsr->GetMark()->nContent;
+    // watch Cursor-Moves
+    CursorStateHelper aCursorSt(*this);
+    aCursorSt.SetCursorToMark(pMark);
+    ++aCursorSt.m_pCursor->GetPoint()->nContent;
+    --aCursorSt.m_pCursor->GetMark()->nContent;
 
-    if(aCrsrSt.RollbackIfIllegal()) return false;
+    if(aCursorSt.RollbackIfIllegal()) return false;
 
-    UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+    UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return true;
 }
 
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 2ad23ba28c39..a3375beceeb0 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -78,19 +78,19 @@ using namespace util;
 void CheckRange( SwCursor* );
 
 /**
- * Check if pCurCrsr points into already existing ranges and delete those.
+ * Check if pCurrentCursor points into already existing ranges and delete those.
  * @param Pointer to SwCursor object
  */
-void CheckRange( SwCursor* pCurCrsr )
+void CheckRange( SwCursor* pCurrentCursor )
 {
-    const SwPosition *pStt = pCurCrsr->Start(),
-        *pEnd = pCurCrsr->GetPoint() == pStt ? pCurCrsr->GetMark() : pCurCrsr->GetPoint();
+    const SwPosition *pStt = pCurrentCursor->Start(),
+        *pEnd = pCurrentCursor->GetPoint() == pStt ? pCurrentCursor->GetMark() : pCurrentCursor->GetPoint();
 
     SwPaM *pTmpDel = nullptr,
-          *pTmp = pCurCrsr->GetNext();
+          *pTmp = pCurrentCursor->GetNext();
 
     // Search the complete ring
-    while( pTmp != pCurCrsr )
+    while( pTmp != pCurrentCursor )
     {
         const SwPosition *pTmpStt = pTmp->Start(),
                         *pTmpEnd = pTmp->GetPoint() == pTmpStt ?
@@ -105,7 +105,7 @@ void CheckRange( SwCursor* pCurCrsr )
             if( *pStt < *pTmpEnd )
                 pTmpDel = pTmp;
 
-         // If Point or Mark is within the Crsr range, we need to remove the old
+         // If Point or Mark is within the Cursor range, we need to remove the old
         // range. Take note that Point does not belong to the range anymore.
         pTmp = pTmp->GetNext();
         delete pTmpDel;         // Remove old range
@@ -113,24 +113,24 @@ void CheckRange( SwCursor* pCurCrsr )
     }
 }
 
-// SwCrsrShell
+// SwCursorShell
 
-SwPaM * SwCrsrShell::CreateCrsr()
+SwPaM * SwCursorShell::CreateCursor()
 {
-    // don't create Crsr in a table Selection (sic!)
+    // don't create Cursor in a table Selection (sic!)
     OSL_ENSURE( !IsTableMode(), "in table Selection" );
 
     // New cursor as copy of current one. Add to the ring.
     // Links point to previously created one, ie forward.
-    SwShellCrsr* pNew = new SwShellCrsr( *m_pCurCrsr );
+    SwShellCursor* pNew = new SwShellCursor( *m_pCurrentCursor );
 
     // Hide PaM logically, to avoid undoing the inverting from
     // copied PaM (#i75172#)
-    pNew->swapContent(*m_pCurCrsr);
+    pNew->swapContent(*m_pCurrentCursor);
 
-    m_pCurCrsr->DeleteMark();
+    m_pCurrentCursor->DeleteMark();
 
-    UpdateCrsr( SwCrsrShell::SCROLLWIN );
+    UpdateCursor( SwCursorShell::SCROLLWIN );
     return pNew;
 }
 
@@ -139,20 +139,20 @@ SwPaM * SwCrsrShell::CreateCrsr()
  * Note, this function does not delete anything if there is no other cursor.
  * @return - returns true if there was another cursor and we deleted one.
  */
-bool SwCrsrShell::DestroyCrsr()
+bool SwCursorShell::DestroyCursor()
 {
-    // don't delete Crsr within table selection
+    // don't delete Cursor within table selection
     OSL_ENSURE( !IsTableMode(), "in table Selection" );
 
     // Is there a next one? Don't do anything if not.
-    if(!m_pCurCrsr->IsMultiSelection())
+    if(!m_pCurrentCursor->IsMultiSelection())
         return false;
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves
-    SwCursor* pNextCrsr = static_cast<SwCursor*>(m_pCurCrsr->GetNext());
-    delete m_pCurCrsr;
-    m_pCurCrsr = dynamic_cast<SwShellCrsr*>(pNextCrsr);
-    UpdateCrsr();
+    SwCallLink aLk( *this ); // watch Cursor-Moves
+    SwCursor* pNextCursor = static_cast<SwCursor*>(m_pCurrentCursor->GetNext());
+    delete m_pCurrentCursor;
+    m_pCurrentCursor = dynamic_cast<SwShellCursor*>(pNextCursor);
+    UpdateCursor();
     return true;
 }
 
@@ -161,87 +161,87 @@ bool SwCrsrShell::DestroyCrsr()
  * Simply returns the current shell cursor if there is no selection
  * (HasSelection()).
  */
-SwPaM & SwCrsrShell::CreateNewShellCursor()
+SwPaM & SwCursorShell::CreateNewShellCursor()
 {
     if (HasSelection())
     {
-        (void) CreateCrsr(); // n.b. returns old cursor
+        (void) CreateCursor(); // n.b. returns old cursor
     }
-    return *GetCrsr();
+    return *GetCursor();
 }
 
 /**
  * Return the current shell cursor
  * @return - returns current `SwPaM` shell cursor
  */
-SwPaM & SwCrsrShell::GetCurrentShellCursor()
+SwPaM & SwCursorShell::GetCurrentShellCursor()
 {
-    return *GetCrsr();
+    return *GetCursor();
 }
 
 /**
  * Return pointer to the current shell cursor
  * @return - returns pointer to current `SwPaM` shell cursor
  */
-SwPaM* SwCrsrShell::GetCrsr( bool bMakeTableCrsr ) const
+SwPaM* SwCursorShell::GetCursor( bool bMakeTableCursor ) const
 {
-    if( m_pTableCrsr )
+    if( m_pTableCursor )
     {
-        if( bMakeTableCrsr && m_pTableCrsr->IsCrsrMovedUpdate() )
+        if( bMakeTableCursor && m_pTableCursor->IsCursorMovedUpdate() )
         {
             //don't re-create 'parked' cursors
             const SwContentNode* pCNd;
-            if( m_pTableCrsr->GetPoint()->nNode.GetIndex() &&
-                m_pTableCrsr->GetMark()->nNode.GetIndex() &&
-                nullptr != ( pCNd = m_pTableCrsr->GetContentNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
-                nullptr != ( pCNd = m_pTableCrsr->GetContentNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
+            if( m_pTableCursor->GetPoint()->nNode.GetIndex() &&
+                m_pTableCursor->GetMark()->nNode.GetIndex() &&
+                nullptr != ( pCNd = m_pTableCursor->GetContentNode() ) && pCNd->getLayoutFrame( GetLayout() ) &&
+                nullptr != ( pCNd = m_pTableCursor->GetContentNode(false) ) && pCNd->getLayoutFrame( GetLayout() ) )
             {
-                SwShellTableCrsr* pTC = m_pTableCrsr;
-                GetLayout()->MakeTableCrsrs( *pTC );
+                SwShellTableCursor* pTC = m_pTableCursor;
+                GetLayout()->MakeTableCursors( *pTC );
             }
         }
 
-        if( m_pTableCrsr->IsChgd() )
+        if( m_pTableCursor->IsChgd() )
         {
-            const_cast<SwCrsrShell*>(this)->m_pCurCrsr =
-                dynamic_cast<SwShellCrsr*>(m_pTableCrsr->MakeBoxSels( m_pCurCrsr ));
+            const_cast<SwCursorShell*>(this)->m_pCurrentCursor =
+                dynamic_cast<SwShellCursor*>(m_pTableCursor->MakeBoxSels( m_pCurrentCursor ));
         }
     }
-    return m_pCurCrsr;
+    return m_pCurrentCursor;
 }
 
-void SwCrsrShell::StartAction()
+void SwCursorShell::StartAction()
 {
     if( !ActionPend() )
     {
         // save for update of the ribbon bar
-        const SwNode& rNd = m_pCurCrsr->GetPoint()->nNode.GetNode();
+        const SwNode& rNd = m_pCurrentCursor->GetPoint()->nNode.GetNode();
         m_nAktNode = rNd.GetIndex();
-        m_nAktContent = m_pCurCrsr->GetPoint()->nContent.GetIndex();
+        m_nAktContent = m_pCurrentCursor->GetPoint()->nContent.GetIndex();
         m_nAktNdTyp = rNd.GetNodeType();
-        m_bAktSelection = *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark();
+        m_bAktSelection = *m_pCurrentCursor->GetPoint() != *m_pCurrentCursor->GetMark();
         if( rNd.IsTextNode() )
-            m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true );
+            m_nLeftFramePos = SwCallLink::getLayoutFrame( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true );
         else
-            m_nLeftFrmPos = 0;
+            m_nLeftFramePos = 0;
     }
     SwViewShell::StartAction(); // to the SwViewShell
 }
 
-void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
+void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
 {
     comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false));
-    bool bVis = m_bSVCrsrVis;
+    bool bVis = m_bSVCursorVis;
 
-    sal_uInt16 eFlags = SwCrsrShell::CHKRANGE;
+    sal_uInt16 eFlags = SwCursorShell::CHKRANGE;
     if ( !DoSetPosX )
-        eFlags |= SwCrsrShell::UPDOWN;
+        eFlags |= SwCursorShell::UPDOWN;
 
 
     // Idle-formatting?
     if( bIdleEnd && Imp()->GetRegion() )
     {
-        m_pCurCrsr->Hide();
+        m_pCurrentCursor->Hide();
     }
 
     // Update all invalid numberings before the last action
@@ -249,18 +249,18 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
         GetDoc()->UpdateNumRule();
 
     // #i76923#: Don't show the cursor in the SwViewShell::EndAction() - call.
-    //           Only the UpdateCrsr shows the cursor.
-    bool bSavSVCrsrVis = m_bSVCrsrVis;
-    m_bSVCrsrVis = false;
+    //           Only the UpdateCursor shows the cursor.
+    bool bSavSVCursorVis = m_bSVCursorVis;
+    m_bSVCursorVis = false;
 
     SwViewShell::EndAction( bIdleEnd );   // have SwViewShell go first
 
-    m_bSVCrsrVis = bSavSVCrsrVis;
+    m_bSVCursorVis = bSavSVCursorVis;
 
     if( ActionPend() )
     {
         if( bVis )    // display SV-Cursor again
-            m_pVisCrsr->Show();
+            m_pVisibleCursor->Show();
 
         // If there is still a ChgCall and just the "basic
         // parenthiszing(?) (Basic-Klammerung)" exists, call it. This
@@ -270,13 +270,13 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
         {
             // Within a Basic action, one needs to update the cursor,
             // to e.g. create the table cursor. This is being done in
-            // UpdateCrsr.
-            UpdateCrsr( eFlags, bIdleEnd );
+            // UpdateCursor.
+            UpdateCursor( eFlags, bIdleEnd );
 
             {
-                // watch Crsr-Moves, call Link if needed, the DTOR is key here!
+                // watch Cursor-Moves, call Link if needed, the DTOR is key here!
                 SwCallLink aLk( *this, m_nAktNode, m_nAktContent, (sal_uInt8)m_nAktNdTyp,
-                                m_nLeftFrmPos, m_bAktSelection );
+                                m_nLeftFramePos, m_bAktSelection );
 
             }
             if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() )
@@ -289,21 +289,21 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
     }
 
     if ( !bIdleEnd )
-        eFlags |= SwCrsrShell::SCROLLWIN;
+        eFlags |= SwCursorShell::SCROLLWIN;
 
-    UpdateCrsr( eFlags, bIdleEnd );      // Show Cursor changes
+    UpdateCursor( eFlags, bIdleEnd );      // Show Cursor changes
 
     {
-        SwCallLink aLk( *this );        // watch Crsr-Moves
+        SwCallLink aLk( *this );        // watch Cursor-Moves
         aLk.nNode = m_nAktNode;           // call Link if needed
         aLk.nNdTyp = (sal_uInt8)m_nAktNdTyp;
         aLk.nContent = m_nAktContent;
-        aLk.nLeftFrmPos = m_nLeftFrmPos;
+        aLk.nLeftFramePos = m_nLeftFramePos;
 
-        if( !m_nCrsrMove ||
-            ( 1 == m_nCrsrMove && m_bInCMvVisportChgd ) )
+        if( !m_nCursorMove ||
+            ( 1 == m_nCursorMove && m_bInCMvVisportChgd ) )
             // display Cursor & Selektions again
-            ShowCrsrs( m_bSVCrsrVis );
+            ShowCursors( m_bSVCursorVis );
     }
     // call ChgCall if there is still one
     if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() )
@@ -313,56 +313,56 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
     }
 }
 
-void SwCrsrShell::SttCrsrMove()
+void SwCursorShell::SttCursorMove()
 {
 #ifdef DBG_UTIL
-    OSL_ENSURE( m_nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
+    OSL_ENSURE( m_nCursorMove < USHRT_MAX, "To many nested CursorMoves." );
 #endif
-    ++m_nCrsrMove;
+    ++m_nCursorMove;
     StartAction();
 }
 
-void SwCrsrShell::EndCrsrMove( const bool bIdleEnd )
+void SwCursorShell::EndCursorMove( const bool bIdleEnd )
 {
 #ifdef DBG_UTIL
-    OSL_ENSURE( m_nCrsrMove, "EndCrsrMove() without SttCrsrMove()." );
+    OSL_ENSURE( m_nCursorMove, "EndCursorMove() without SttCursorMove()." );
 #endif
     EndAction( bIdleEnd, true );
-    --m_nCrsrMove;
+    --m_nCursorMove;
 #ifdef DBG_UTIL
-    if( !m_nCrsrMove )
+    if( !m_nCursorMove )
         m_bInCMvVisportChgd = false;
 #endif
 }
 
-bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
+bool SwCursorShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
                              bool bVisualAllowed )
 {
     if( IsTableMode() )
         return bLeft ? GoPrevCell() : GoNextCell();
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
     bool bRet = false;
 
     // #i27615# Handle cursor in front of label.
     const SwTextNode* pTextNd = nullptr;
 
-    if( m_pBlockCrsr )
-        m_pBlockCrsr->clearPoints();
+    if( m_pBlockCursor )
+        m_pBlockCursor->clearPoints();
 
     // 1. CASE: Cursor is in front of label. A move to the right
     // will simply reset the bInFrontOfLabel flag:
-    SwShellCrsr* pShellCrsr = getShellCrsr( true );
-    if ( !bLeft && pShellCrsr->IsInFrontOfLabel() )
+    SwShellCursor* pShellCursor = getShellCursor( true );
+    if ( !bLeft && pShellCursor->IsInFrontOfLabel() )
     {
         SetInFrontOfLabel( false );
         bRet = true;
     }
     // 2. CASE: Cursor is at beginning of numbered paragraph. A move
     // to the left will simply set the bInFrontOfLabel flag:
-    else if ( bLeft && 0 == pShellCrsr->GetPoint()->nContent.GetIndex() &&
-             !pShellCrsr->IsInFrontOfLabel() && !pShellCrsr->HasMark() &&
-             nullptr != ( pTextNd = pShellCrsr->GetNode().GetTextNode() ) &&
+    else if ( bLeft && 0 == pShellCursor->GetPoint()->nContent.GetIndex() &&
+             !pShellCursor->IsInFrontOfLabel() && !pShellCursor->HasMark() &&
+             nullptr != ( pTextNd = pShellCursor->GetNode().GetTextNode() ) &&
              pTextNd->HasVisibleNumberingOrBullet() )
     {
         SetInFrontOfLabel( true );
@@ -376,8 +376,8 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
         // To avoid loop the reset of <bInFrontOfLabel> flag is no longer
         // reflected in the return value <bRet>.
         const bool bResetOfInFrontOfLabel = SetInFrontOfLabel( false );
-        bRet = pShellCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed,
-                                      bSkipHidden, !IsOverwriteCrsr() );
+        bRet = pShellCursor->LeftRight( bLeft, nCnt, nMode, bVisualAllowed,
+                                      bSkipHidden, !IsOverwriteCursor() );
         if ( !bRet && bLeft && bResetOfInFrontOfLabel )
         {
             // undo reset of <bInFrontOfLabel> flag
@@ -387,13 +387,13 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
 
     if( bRet )
     {
-        UpdateCrsr();
+        UpdateCursor();
     }
 
     return bRet;
 }
 
-void SwCrsrShell::MarkListLevel( const OUString& sListId,
+void SwCursorShell::MarkListLevel( const OUString& sListId,
                                  const int nListLevel )
 {
     if ( sListId != m_sMarkedListId ||
@@ -412,18 +412,18 @@ void SwCrsrShell::MarkListLevel( const OUString& sListId,
     }
 }
 
-void SwCrsrShell::UpdateMarkedListLevel()
+void SwCursorShell::UpdateMarkedListLevel()
 {
-    SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
+    SwTextNode * pTextNd = _GetCursor()->GetNode().GetTextNode();
 
     if ( pTextNd )
     {
         if ( !pTextNd->IsNumbered() )
         {
-            m_pCurCrsr->_SetInFrontOfLabel( false );
+            m_pCurrentCursor->_SetInFrontOfLabel( false );
             MarkListLevel( OUString(), 0 );
         }
-        else if ( m_pCurCrsr->IsInFrontOfLabel() )
+        else if ( m_pCurrentCursor->IsInFrontOfLabel() )
         {
             if ( pTextNd->IsInList() )
             {
@@ -440,7 +440,7 @@ void SwCrsrShell::UpdateMarkedListLevel()
     }
 }
 
-void SwCrsrShell::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
+void SwCursorShell::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
 {
 #ifdef ACCESSIBLE_LAYOUT
     if( Imp()->IsAccessible() )
@@ -451,7 +451,7 @@ void SwCrsrShell::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
 #endif
 }
 
-void SwCrsrShell::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn)
+void SwCursorShell::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn)
 {
 #ifdef ACCESSIBLE_LAYOUT
     if( Imp()->IsAccessible() )
@@ -462,7 +462,7 @@ void SwCrsrShell::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewCo
 #endif
 }
 
-void SwCrsrShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection)
+void SwCursorShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection)
 {
 #ifdef ACCESSIBLE_LAYOUT
     if( Imp()->IsAccessible() )
@@ -473,24 +473,24 @@ void SwCrsrShell::FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNew
 #endif
 }
 
-bool SwCrsrShell::bColumnChange()
+bool SwCursorShell::bColumnChange()
 {
-    SwFrm* pCurrFrm = GetCurrFrm(false);
+    SwFrame* pCurrFrame = GetCurrFrame(false);
 
-    if (pCurrFrm == nullptr)
+    if (pCurrFrame == nullptr)
     {
         return false;
     }
 
-    SwFrm* pCurrCol=static_cast<SwFrm*>(pCurrFrm)->FindColFrm();
+    SwFrame* pCurrCol=static_cast<SwFrame*>(pCurrFrame)->FindColFrame();
 
-    while(pCurrCol== nullptr && pCurrFrm!=nullptr )
+    while(pCurrCol== nullptr && pCurrFrame!=nullptr )
     {
-        SwLayoutFrm* pParent = pCurrFrm->GetUpper();
+        SwLayoutFrame* pParent = pCurrFrame->GetUpper();
         if(pParent!=nullptr)
         {
-            pCurrCol=static_cast<SwFrm*>(pParent)->FindColFrm();
-            pCurrFrm = static_cast<SwFrm*>(pParent);
+            pCurrCol=static_cast<SwFrame*>(pParent)->FindColFrame();
+            pCurrFrame = static_cast<SwFrame*>(pParent);
         }
         else
         {
@@ -498,65 +498,65 @@ bool SwCrsrShell::bColumnChange()
         }
     }
 
-    if(m_oldColFrm == pCurrCol)
+    if(m_oldColFrame == pCurrCol)
         return false;
     else
     {
-        m_oldColFrm = pCurrCol;
+        m_oldColFrame = pCurrCol;
         return true;
     }
 }
 
-bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
+bool SwCursorShell::UpDown( bool bUp, sal_uInt16 nCnt )
 {
     SET_CURR_SHELL( this );
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
 
     bool bTableMode = IsTableMode();
-    SwShellCrsr* pTmpCrsr = getShellCrsr( true );
+    SwShellCursor* pTmpCursor = getShellCursor( true );
 
-    bool bRet = pTmpCrsr->UpDown( bUp, nCnt );
+    bool bRet = pTmpCursor->UpDown( bUp, nCnt );
     // #i40019# UpDown should always reset the bInFrontOfLabel flag:
     bRet |= SetInFrontOfLabel(false);
 
-    if( m_pBlockCrsr )
-        m_pBlockCrsr->clearPoints();
+    if( m_pBlockCursor )
+        m_pBlockCursor->clearPoints();
 
     if( bRet )
     {
-        m_eMvState = MV_UPDOWN; // status for Crsr travelling - GetCrsrOfst
+        m_eMvState = MV_UPDOWN; // status for Cursor travelling - GetCursorOfst
         if( !ActionPend() )
         {
-            CrsrFlag eUpdateMode = SwCrsrShell::SCROLLWIN;
+            CursorFlag eUpdateMode = SwCursorShell::SCROLLWIN;
             if( !bTableMode )
-                eUpdateMode = (CrsrFlag) (eUpdateMode
-                            | SwCrsrShell::UPDOWN | SwCrsrShell::CHKRANGE);
-            UpdateCrsr( static_cast<sal_uInt16>(eUpdateMode) );
+                eUpdateMode = (CursorFlag) (eUpdateMode
+                            | SwCursorShell::UPDOWN | SwCursorShell::CHKRANGE);
+            UpdateCursor( static_cast<sal_uInt16>(eUpdateMode) );
         }
     }
     return bRet;
 }
 
-bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
+bool SwCursorShell::LRMargin( bool bLeft, bool bAPI)
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
     SET_CURR_SHELL( this );
-    m_eMvState = MV_LEFTMARGIN; // status for Crsr travelling - GetCrsrOfst
+    m_eMvState = MV_LEFTMARGIN; // status for Cursor travelling - GetCursorOfst
 
     const bool bTableMode = IsTableMode();
-    SwShellCrsr* pTmpCrsr = getShellCrsr( true );
+    SwShellCursor* pTmpCursor = getShellCursor( true );
 
-    if( m_pBlockCrsr )
-        m_pBlockCrsr->clearPoints();
+    if( m_pBlockCursor )
+        m_pBlockCursor->clearPoints();
 
     const bool bWasAtLM =
-            ( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() );
+            ( 0 == _GetCursor()->GetPoint()->nContent.GetIndex() );
 
-    bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
+    bool bRet = pTmpCursor->LeftRightMargin( bLeft, bAPI );
 
-    if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCrsr()->HasMark() )
+    if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCursor()->HasMark() )
     {
-        const SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
+        const SwTextNode * pTextNd = _GetCursor()->GetNode().GetTextNode();
         if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() )
             SetInFrontOfLabel( true );
     }
@@ -567,51 +567,51 @@ bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
 
     if( bRet )
     {
-        UpdateCrsr();
+        UpdateCursor();
     }
     return bRet;
 }
 
-bool SwCrsrShell::IsAtLRMargin( bool bLeft, bool bAPI ) const
+bool SwCursorShell::IsAtLRMargin( bool bLeft, bool bAPI ) const
 {
-    const SwShellCrsr* pTmpCrsr = getShellCrsr( true );
-    return pTmpCrsr->IsAtLeftRightMargin( bLeft, bAPI );
+    const SwShellCursor* pTmpCursor = getShellCursor( true );
+    return pTmpCursor->IsAtLeftRightMargin( bLeft, bAPI );
 }
 
-bool SwCrsrShell::SttEndDoc( bool bStt )
+bool SwCursorShell::SttEndDoc( bool bStt )
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
 
-    SwShellCrsr* pTmpCrsr = m_pBlockCrsr ? &m_pBlockCrsr->getShellCrsr() : m_pCurCrsr;
-    bool bRet = pTmpCrsr->SttEndDoc( bStt );
+    SwShellCursor* pTmpCursor = m_pBlockCursor ? &m_pBlockCursor->getShellCursor() : m_pCurrentCursor;
+    bool bRet = pTmpCursor->SttEndDoc( bStt );
     if( bRet )
     {
         if( bStt )
-            pTmpCrsr->GetPtPos().Y() = 0; // set to 0 explicitly (table header)
-        if( m_pBlockCrsr )
+            pTmpCursor->GetPtPos().Y() = 0; // set to 0 explicitly (table header)
+        if( m_pBlockCursor )
         {
-            m_pBlockCrsr->clearPoints();
+            m_pBlockCursor->clearPoints();
             RefreshBlockCursor();
         }
 
-        UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+        UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     }
     return bRet;
 }
 
-void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
+void SwCursorShell::ExtendedSelectAll(bool bFootnotes)
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
-    SwPosition* pPos = m_pCurCrsr->GetPoint();
+    SwPosition* pPos = m_pCurrentCursor->GetPoint();
     pPos->nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext();
     pPos->nContent.Assign( rNodes.GoNext( &pPos->nNode ), 0 );
-    pPos = m_pCurCrsr->GetMark();
+    pPos = m_pCurrentCursor->GetMark();
     pPos->nNode = rNodes.GetEndOfContent();
     SwContentNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
     pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 }
 
-bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
+bool SwCursorShell::ExtendedSelectedAll(bool bFootnotes)
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext();
@@ -625,11 +625,11 @@ bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
 
     SwPosition aStart(*pStart, 0);
     SwPosition aEnd(*pEnd, pEnd->Len());
-    SwShellCrsr* pShellCrsr = getShellCrsr(false);
-    return aStart == *pShellCrsr->Start() && aEnd == *pShellCrsr->End();
+    SwShellCursor* pShellCursor = getShellCursor(false);
+    return aStart == *pShellCursor->Start() && aEnd == *pShellCursor->End();
 }
 
-bool SwCrsrShell::StartsWithTable()
+bool SwCursorShell::StartsWithTable()
 {
     SwNodes& rNodes = GetDoc()->GetNodes();
     SwNodeIndex nNode(rNodes.GetEndOfExtras());
@@ -637,117 +637,117 @@ bool SwCrsrShell::StartsWithTable()
     return pContentNode->FindTableNode();
 }
 
-bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
+bool SwCursorShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
 {
     bool bRet = false;
 
     // never jump of section borders at selection
-    if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoContent() )
+    if( !m_pCurrentCursor->HasMark() || !m_pCurrentCursor->IsNoContent() )
     {
-        SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+        SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
         SET_CURR_SHELL( this );
 
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
-        Point& rPt = m_pCurCrsr->GetPtPos();
-        SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->
-                            getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
-        if( pFrm && ( bRet = GetFrmInPage( pFrm, fnWhichPage,
-                                           fnPosPage, m_pCurCrsr )  ) &&
-            !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
+        Point& rPt = m_pCurrentCursor->GetPtPos();
+        SwContentFrame * pFrame = m_pCurrentCursor->GetContentNode()->
+                            getLayoutFrame( GetLayout(), &rPt, m_pCurrentCursor->GetPoint(), false );
+        if( pFrame && ( bRet = GetFrameInPage( pFrame, fnWhichPage,
+                                           fnPosPage, m_pCurrentCursor )  ) &&
+            !m_pCurrentCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                  nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
-            UpdateCrsr();
+            UpdateCursor();
         else
             bRet = false;
     }
     return bRet;
 }
 
-bool SwCrsrShell::isInHiddenTextFrm(SwShellCrsr* pShellCrsr)
+bool SwCursorShell::isInHiddenTextFrame(SwShellCursor* pShellCursor)
 {
-    SwContentNode *pCNode = pShellCrsr->GetContentNode();
-    SwContentFrm  *pFrm = pCNode ?
-        pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false ) : nullptr;
-    return !pFrm || (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow());
+    SwContentNode *pCNode = pShellCursor->GetContentNode();
+    SwContentFrame  *pFrame = pCNode ?
+        pCNode->getLayoutFrame( GetLayout(), &pShellCursor->GetPtPos(), pShellCursor->GetPoint(), false ) : nullptr;
+    return !pFrame || (pFrame->IsTextFrame() && static_cast<SwTextFrame*>(pFrame)->IsHiddenNow());
 }
 
-bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
+bool SwCursorShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    SwShellCrsr* pTmpCrsr = getShellCrsr( true );
-    bool bRet = pTmpCrsr->MovePara( fnWhichPara, fnPosPara );
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    SwShellCursor* pTmpCursor = getShellCursor( true );
+    bool bRet = pTmpCursor->MovePara( fnWhichPara, fnPosPara );
     if( bRet )
     {
         //keep going until we get something visible, i.e. skip
         //over hidden paragraphs, don't get stuck at the start
-        //which is what SwCrsrShell::UpdateCrsrPos will reset
+        //which is what SwCursorShell::UpdateCursorPos will reset
         //the position to if we pass it a position in an
         //invisible hidden paragraph field
-        while (isInHiddenTextFrm(pTmpCrsr))
+        while (isInHiddenTextFrame(pTmpCursor))
         {
-            if (!pTmpCrsr->MovePara(fnWhichPara, fnPosPara))
+            if (!pTmpCursor->MovePara(fnWhichPara, fnPosPara))
                 break;
         }
 
-        UpdateCrsr();
+        UpdateCursor();
     }
     return bRet;
 }
 
-bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
+bool SwCursorShell::MoveSection( SwWhichSection fnWhichSect,
                                 SwPosSection fnPosSect)
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    SwCursor* pTmpCrsr = getShellCrsr( true );
-    bool bRet = pTmpCrsr->MoveSection( fnWhichSect, fnPosSect );
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    SwCursor* pTmpCursor = getShellCursor( true );
+    bool bRet = pTmpCursor->MoveSection( fnWhichSect, fnPosSect );
     if( bRet )
-        UpdateCrsr();
+        UpdateCursor();
     return bRet;
 
 }
 
 // position cursor
 
-static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
+static SwFrame* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
 {
-    SwFrm* pFrm = nullptr;
+    SwFrame* pFrame = nullptr;
     SwContentNode* pCNd = rIdx.GetNode().GetContentNode();
     if( pCNd )
     {
-        SwContentFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, nullptr, false );
-        pFrm = pCntFrm ? pCntFrm->GetUpper() : nullptr;
-        while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
-            pFrm = pFrm->IsFlyFrm() ? static_cast<SwFlyFrm*>(pFrm)->AnchorFrm()
-                                    : pFrm->GetUpper();
+        SwContentFrame *pContentFrame = pCNd->getLayoutFrame( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, nullptr, false );
+        pFrame = pContentFrame ? pContentFrame->GetUpper() : nullptr;
+        while( pFrame && !pFrame->IsHeaderFrame() && !pFrame->IsFooterFrame() )
+            pFrame = pFrame->IsFlyFrame() ? static_cast<SwFlyFrame*>(pFrame)->AnchorFrame()
+                                    : pFrame->GetUpper();
     }
-    return pFrm;
+    return pFrame;
 }
 
-bool SwCrsrShell::IsInHeaderFooter( bool* pbInHeader ) const
+bool SwCursorShell::IsInHeaderFooter( bool* pbInHeader ) const
 {
     Point aPt;
-    SwFrm* pFrm = ::lcl_IsInHeaderFooter( m_pCurCrsr->GetPoint()->nNode, aPt );
-    if( pFrm && pbInHeader )
-        *pbInHeader = pFrm->IsHeaderFrm();
-    return nullptr != pFrm;
+    SwFrame* pFrame = ::lcl_IsInHeaderFooter( m_pCurrentCursor->GetPoint()->nNode, aPt );
+    if( pFrame && pbInHeader )
+        *pbInHeader = pFrame->IsHeaderFrame();
+    return nullptr != pFrame;
 }
 
-int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
+int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock )
 {
     SET_CURR_SHELL( this );
 
-    SwShellCrsr* pCrsr = getShellCrsr( bBlock );
-    SwPosition aPos( *pCrsr->GetPoint() );
+    SwShellCursor* pCursor = getShellCursor( bBlock );
+    SwPosition aPos( *pCursor->GetPoint() );
     Point aPt( rLPt );
-    Point & rAktCrsrPt = pCrsr->GetPtPos();
-    SwCrsrMoveState aTmpState( IsTableMode() ? MV_TBLSEL :
+    Point & rAktCursorPt = pCursor->GetPtPos();
+    SwCursorMoveState aTmpState( IsTableMode() ? MV_TBLSEL :
                                     bOnlyText ?  MV_SETONLYTEXT : MV_NONE );
     aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
 
-    SwTextNode * pTextNd = pCrsr->GetNode().GetTextNode();
+    SwTextNode * pTextNd = pCursor->GetNode().GetTextNode();
 
     if ( pTextNd && !IsTableMode() &&
         // #i37515# No bInFrontOfLabel during selection
-        !pCrsr->HasMark() &&
+        !pCursor->HasMark() &&
         pTextNd->HasVisibleNumberingOrBullet() )
     {
         aTmpState.m_bInFrontOfLabel = true; // #i27615#
@@ -758,48 +758,48 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     }
 
     int bRet = CRSR_POSOLD |
-                ( GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState )
+                ( GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState )
                     ? 0 : CRSR_POSCHG );
 
     const bool bOldInFrontOfLabel = IsInFrontOfLabel();
     const bool bNewInFrontOfLabel = aTmpState.m_bInFrontOfLabel;
 
-    pCrsr->SetCrsrBidiLevel( aTmpState.m_nCursorBidiLevel );
+    pCursor->SetCursorBidiLevel( aTmpState.m_nCursorBidiLevel );
 
     if( MV_RIGHTMARGIN == aTmpState.m_eState )
         m_eMvState = MV_RIGHTMARGIN;
     // is the new position in header or footer?
-    SwFrm* pFrm = lcl_IsInHeaderFooter( aPos.nNode, aPt );
-    if( IsTableMode() && !pFrm && aPos.nNode.GetNode().StartOfSectionNode() ==
-        pCrsr->GetPoint()->nNode.GetNode().StartOfSectionNode() )
+    SwFrame* pFrame = lcl_IsInHeaderFooter( aPos.nNode, aPt );
+    if( IsTableMode() && !pFrame && aPos.nNode.GetNode().StartOfSectionNode() ==
+        pCursor->GetPoint()->nNode.GetNode().StartOfSectionNode() )
         // same table column and not in header/footer -> back
         return bRet;
 
-    if( m_pBlockCrsr && bBlock )
+    if( m_pBlockCursor && bBlock )
     {
-        m_pBlockCrsr->setEndPoint( rLPt );
-        if( !pCrsr->HasMark() )
-            m_pBlockCrsr->setStartPoint( rLPt );
-        else if( !m_pBlockCrsr->getStartPoint() )
-            m_pBlockCrsr->setStartPoint( pCrsr->GetMkPos() );
+        m_pBlockCursor->setEndPoint( rLPt );
+        if( !pCursor->HasMark() )
+            m_pBlockCursor->setStartPoint( rLPt );
+        else if( !m_pBlockCursor->getStartPoint() )
+            m_pBlockCursor->setStartPoint( pCursor->GetMkPos() );
     }
-    if( !pCrsr->HasMark() )
+    if( !pCursor->HasMark() )
     {
         // is at the same position and if in header/footer -> in the same
-        if( aPos == *pCrsr->GetPoint() &&
+        if( aPos == *pCursor->GetPoint() &&
             bOldInFrontOfLabel == bNewInFrontOfLabel )
         {
-            if( pFrm )
+            if( pFrame )
             {
-                if( pFrm->Frm().IsInside( rAktCrsrPt ))
+                if( pFrame->Frame().IsInside( rAktCursorPt ))
                     return bRet;
             }
             else if( aPos.nNode.GetNode().IsContentNode() )
             {
                 // in the same frame?
-                SwFrm* pOld = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrame* pOld = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrame(
                                 GetLayout(), &m_aCharRect.Pos(), nullptr, false );
-                SwFrm* pNew = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+                SwFrame* pNew = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrame(
                                 GetLayout(), &aPt, nullptr, false );
                 if( pNew == pOld )
                     return bRet;
@@ -809,51 +809,51 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     else
     {
         // SSelection over not allowed sections or if in header/footer -> different
-        if( !CheckNodesRange( aPos.nNode, pCrsr->GetMark()->nNode, true )
-            || ( pFrm && !pFrm->Frm().IsInside( pCrsr->GetMkPos() ) ))
+        if( !CheckNodesRange( aPos.nNode, pCursor->GetMark()->nNode, true )
+            || ( pFrame && !pFrame->Frame().IsInside( pCursor->GetMkPos() ) ))
             return bRet;
 
         // is at same position but not in header/footer
-        if( aPos == *pCrsr->GetPoint() )
+        if( aPos == *pCursor->GetPoint() )
             return bRet;
     }
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    SwCrsrSaveState aSaveState( *pCrsr );
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    SwCursorSaveState aSaveState( *pCursor );
 
-    *pCrsr->GetPoint() = aPos;
-    rAktCrsrPt = aPt;
+    *pCursor->GetPoint() = aPos;
+    rAktCursorPt = aPt;
 
     // #i41424# Only update the marked number levels if necessary
     // Force update of marked number levels if necessary.
     if ( bNewInFrontOfLabel || bOldInFrontOfLabel )
-        m_pCurCrsr->_SetInFrontOfLabel( !bNewInFrontOfLabel );
+        m_pCurrentCursor->_SetInFrontOfLabel( !bNewInFrontOfLabel );
     SetInFrontOfLabel( bNewInFrontOfLabel );
 
-    if( !pCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
+    if( !pCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
     {
-        sal_uInt16 nFlag = SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE;
-        UpdateCrsr( nFlag );
+        sal_uInt16 nFlag = SwCursorShell::SCROLLWIN | SwCursorShell::CHKRANGE;
+        UpdateCursor( nFlag );
         bRet &= ~CRSR_POSOLD;
     }
-    else if( bOnlyText && !m_pCurCrsr->HasMark() )
+    else if( bOnlyText && !m_pCurrentCursor->HasMark() )
     {
         if( FindValidContentNode( bOnlyText ) )
         {
             // position cursor in a valid content
-            if( aPos == *pCrsr->GetPoint() )
+            if( aPos == *pCursor->GetPoint() )
                 bRet = CRSR_POSOLD;
             else
             {
-                UpdateCrsr();
+                UpdateCursor();
                 bRet &= ~CRSR_POSOLD;
             }
         }
         else
         {
             // there is no valid content -> hide cursor
-            m_pVisCrsr->Hide(); // always hide visible cursor
-            m_eMvState = MV_NONE; // status for Crsr travelling
+            m_pVisibleCursor->Hide(); // always hide visible cursor
+            m_eMvState = MV_NONE; // status for Cursor travelling
             m_bAllProtect = true;
             if( GetDoc()->GetDocShell() )
             {
@@ -865,87 +865,87 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
     return bRet;
 }
 
-void SwCrsrShell::TableCrsrToCursor()
+void SwCursorShell::TableCursorToCursor()
 {
-    OSL_ENSURE( m_pTableCrsr, "TableCrsrToCursor: Why?" );
-    delete m_pTableCrsr, m_pTableCrsr = nullptr;
+    OSL_ENSURE( m_pTableCursor, "TableCursorToCursor: Why?" );
+    delete m_pTableCursor, m_pTableCursor = nullptr;
 }
 
-void SwCrsrShell::BlockCrsrToCrsr()
+void SwCursorShell::BlockCursorToCursor()
 {
-    OSL_ENSURE( m_pBlockCrsr, "BlockCrsrToCrsr: Why?" );
-    if( m_pBlockCrsr && !HasSelection() )
+    OSL_ENSURE( m_pBlockCursor, "BlockCursorToCursor: Why?" );
+    if( m_pBlockCursor && !HasSelection() )
     {
-        SwPaM& rPam = m_pBlockCrsr->getShellCrsr();
-        m_pCurCrsr->SetMark();
-        *m_pCurCrsr->GetPoint() = *rPam.GetPoint();
+        SwPaM& rPam = m_pBlockCursor->getShellCursor();
+        m_pCurrentCursor->SetMark();
+        *m_pCurrentCursor->GetPoint() = *rPam.GetPoint();
         if( rPam.HasMark() )
-            *m_pCurCrsr->GetMark() = *rPam.GetMark();
+            *m_pCurrentCursor->GetMark() = *rPam.GetMark();
         else
-            m_pCurCrsr->DeleteMark();
+            m_pCurrentCursor->DeleteMark();
     }
-    delete m_pBlockCrsr, m_pBlockCrsr = nullptr;
+    delete m_pBlockCursor, m_pBlockCursor = nullptr;
 }
 
-void SwCrsrShell::CrsrToBlockCrsr()
+void SwCursorShell::CursorToBlockCursor()
 {
-    if( !m_pBlockCrsr )
+    if( !m_pBlockCursor )
     {
-        SwPosition aPos( *m_pCurCrsr->GetPoint() );
-        m_pBlockCrsr = new SwBlockCursor( *this, aPos );
-        SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
-        rBlock.GetPtPos() = m_pCurCrsr->GetPtPos();
-        if( m_pCurCrsr->HasMark() )
+        SwPosition aPos( *m_pCurrentCursor->GetPoint() );
+        m_pBlockCursor = new SwBlockCursor( *this, aPos );
+        SwShellCursor &rBlock = m_pBlockCursor->getShellCursor();
+        rBlock.GetPtPos() = m_pCurrentCursor->GetPtPos();
+        if( m_pCurrentCursor->HasMark() )
         {
             rBlock.SetMark();
-            *rBlock.GetMark() = *m_pCurCrsr->GetMark();
-            rBlock.GetMkPos() = m_pCurCrsr->GetMkPos();
+            *rBlock.GetMark() = *m_pCurrentCursor->GetMark();
+            rBlock.GetMkPos() = m_pCurrentCursor->GetMkPos();
         }
     }
-    m_pBlockCrsr->clearPoints();
+    m_pBlockCursor->clearPoints();
     RefreshBlockCursor();
 }
 
-void SwCrsrShell::ClearMark()
+void SwCursorShell::ClearMark()
 {
     // is there any GetMark?
-    if( m_pTableCrsr )
+    if( m_pTableCursor )
     {
-        std::vector<SwPaM*> vCrsrs;
-        for(auto& rCrsr : m_pCurCrsr->GetRingContainer())
-            if(&rCrsr != m_pCurCrsr)
-                vCrsrs.push_back(&rCrsr);
-        for(auto pCrsr : vCrsrs)
-            delete pCrsr;
-        m_pTableCrsr->DeleteMark();
+        std::vector<SwPaM*> vCursors;
+        for(auto& rCursor : m_pCurrentCursor->GetRingContainer())
+            if(&rCursor != m_pCurrentCursor)
+                vCursors.push_back(&rCursor);
+        for(auto pCursor : vCursors)
+            delete pCursor;
+        m_pTableCursor->DeleteMark();
 
-        m_pCurCrsr->DeleteMark();
+        m_pCurrentCursor->DeleteMark();
 
-        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
-        delete m_pTableCrsr, m_pTableCrsr = nullptr;
-        m_pCurCrsr->SwSelPaintRects::Show();
+        *m_pCurrentCursor->GetPoint() = *m_pTableCursor->GetPoint();
+        m_pCurrentCursor->GetPtPos() = m_pTableCursor->GetPtPos();
+        delete m_pTableCursor, m_pTableCursor = nullptr;
+        m_pCurrentCursor->SwSelPaintRects::Show();
     }
     else
     {
-        if( !m_pCurCrsr->HasMark() )
+        if( !m_pCurrentCursor->HasMark() )
             return;
-        m_pCurCrsr->DeleteMark();
-        if( !m_nCrsrMove )
-            m_pCurCrsr->SwSelPaintRects::Show();
+        m_pCurrentCursor->DeleteMark();
+        if( !m_nCursorMove )
+            m_pCurrentCursor->SwSelPaintRects::Show();
     }
 }
 
-void SwCrsrShell::NormalizePam(bool bPointFirst)
+void SwCursorShell::NormalizePam(bool bPointFirst)
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    m_pCurCrsr->Normalize(bPointFirst);
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    m_pCurrentCursor->Normalize(bPointFirst);
 }
 
-void SwCrsrShell::SwapPam()
+void SwCursorShell::SwapPam()
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    m_pCurCrsr->Exchange();
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    m_pCurrentCursor->Exchange();
 }
 
 //TODO: provide documentation
@@ -959,7 +959,7 @@ void SwCrsrShell::SwapPam()
     @param bTstOnly Should I only do a test run? If true so do not move cursor.
     @param bTstHit ???
 */
-bool SwCrsrShell::ChgCurrPam(
+bool SwCursorShell::ChgCurrPam(
     const Point & rPt,
     bool bTstOnly,
     bool bTstHit )
@@ -967,98 +967,98 @@ bool SwCrsrShell::ChgCurrPam(
     SET_CURR_SHELL( this );
 
     // check if the SPoint is in a table selection
-    if( bTstOnly && m_pTableCrsr )
-        return m_pTableCrsr->IsInside( rPt );
+    if( bTstOnly && m_pTableCursor )
+        return m_pTableCursor->IsInside( rPt );
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
     // search position <rPt> in document
-    SwPosition aPtPos( *m_pCurCrsr->GetPoint() );
+    SwPosition aPtPos( *m_pCurrentCursor->GetPoint() );
     Point aPt( rPt );
 
-    SwCrsrMoveState aTmpState( MV_NONE );
+    SwCursorMoveState aTmpState( MV_NONE );
     aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
-    if ( !GetLayout()->GetCrsrOfst( &aPtPos, aPt, &aTmpState ) && bTstHit )
+    if ( !GetLayout()->GetCursorOfst( &aPtPos, aPt, &aTmpState ) && bTstHit )
         return false;
 
     // search in all selections for this position
-    SwShellCrsr* pCmp = m_pCurCrsr; // keep the pointer on cursor
+    SwShellCursor* pCmp = m_pCurrentCursor; // keep the pointer on cursor
     do {
         if( pCmp && pCmp->HasMark() &&
             *pCmp->Start() <= aPtPos && *pCmp->End() > aPtPos )
         {
-            if( bTstOnly || m_pCurCrsr == pCmp ) // is the current
+            if( bTstOnly || m_pCurrentCursor == pCmp ) // is the current
                 return true;               // return without update
 
-            m_pCurCrsr = pCmp;
-            UpdateCrsr(); // cursor is already at the right position
+            m_pCurrentCursor = pCmp;
+            UpdateCursor(); // cursor is already at the right position
             return true;
         }
-    } while( m_pCurCrsr !=
-        ( pCmp = dynamic_cast<SwShellCrsr*>(pCmp->GetNext()) ) );
+    } while( m_pCurrentCursor !=
+        ( pCmp = dynamic_cast<SwShellCursor*>(pCmp->GetNext()) ) );
     return false;
 }
 
-void SwCrsrShell::KillPams()
+void SwCursorShell::KillPams()
 {
     // Does any exist for deletion?
-    if( !m_pTableCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
+    if( !m_pTableCursor && !m_pBlockCursor && !m_pCurrentCursor->IsMultiSelection() )
         return;
 
-    while( m_pCurCrsr->GetNext() != m_pCurCrsr )
-        delete m_pCurCrsr->GetNext();
-    m_pCurCrsr->SetColumnSelection( false );
+    while( m_pCurrentCursor->GetNext() != m_pCurrentCursor )
+        delete m_pCurrentCursor->GetNext();
+    m_pCurrentCursor->SetColumnSelection( false );
 
-    if( m_pTableCrsr )
+    if( m_pTableCursor )
     {
         // delete the ring of cursors
-        m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
-        delete m_pTableCrsr;
-        m_pTableCrsr = nullptr;
+        m_pCurrentCursor->DeleteMark();
+        *m_pCurrentCursor->GetPoint() = *m_pTableCursor->GetPoint();
+        m_pCurrentCursor->GetPtPos() = m_pTableCursor->GetPtPos();
+        delete m_pTableCursor;
+        m_pTableCursor = nullptr;
     }
-    else if( m_pBlockCrsr )
+    else if( m_pBlockCursor )
     {
         // delete the ring of cursors
-        m_pCurCrsr->DeleteMark();
-        SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
-        *m_pCurCrsr->GetPoint() = *rBlock.GetPoint();
-        m_pCurCrsr->GetPtPos() = rBlock.GetPtPos();
+        m_pCurrentCursor->DeleteMark();
+        SwShellCursor &rBlock = m_pBlockCursor->getShellCursor();
+        *m_pCurrentCursor->GetPoint() = *rBlock.GetPoint();
+        m_pCurrentCursor->GetPtPos() = rBlock.GetPtPos();
         rBlock.DeleteMark();
-        m_pBlockCrsr->clearPoints();
+        m_pBlockCursor->clearPoints();
     }
-    UpdateCrsr( SwCrsrShell::SCROLLWIN );
+    UpdateCursor( SwCursorShell::SCROLLWIN );
 }
 
-int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const
+int SwCursorShell::CompareCursor( CursorCompareType eType ) const
 {
     int nRet = 0;
     const SwPosition *pFirst = nullptr, *pSecond = nullptr;
-    const SwPaM *pCur = GetCrsr(), *pStk = m_pCrsrStk;
+    const SwPaM *pCur = GetCursor(), *pStack = m_pCursorStack;
     // cursor on stack is needed if we compare against stack
-    if( pStk || ( eType == CurrPtCurrMk ) )
+    if( pStack || ( eType == CurrPtCurrMk ) )
     {
         switch ( eType)
         {
         case StackPtStackMk:
-            pFirst = pStk->GetPoint();
-            pSecond = pStk->GetMark();
+            pFirst = pStack->GetPoint();
+            pSecond = pStack->GetMark();
             break;
         case StackPtCurrPt:
-            pFirst = pStk->GetPoint();
+            pFirst = pStack->GetPoint();
             pSecond = pCur->GetPoint();
             break;
         case StackPtCurrMk:
-            pFirst = pStk->GetPoint();
+            pFirst = pStack->GetPoint();
             pSecond = pCur->GetMark();
             break;
         case StackMkCurrPt:
-            pFirst = pStk->GetMark();
+            pFirst = pStack->GetMark();
             pSecond = pCur->GetPoint();
             break;
         case StackMkCurrMk:
-            pFirst = pStk->GetMark();
-            pSecond = pStk->GetMark();
+            pFirst = pStack->GetMark();
+            pSecond = pStack->GetMark();
             break;
         case CurrPtCurrMk:
             pFirst = pCur->GetPoint();
@@ -1077,19 +1077,19 @@ int SwCrsrShell::CompareCursor( CrsrCompareType eType ) const
     return nRet;
 }
 
-bool SwCrsrShell::IsSttPara() const
-{   return m_pCurCrsr->GetPoint()->nContent == 0; }
+bool SwCursorShell::IsSttPara() const
+{   return m_pCurrentCursor->GetPoint()->nContent == 0; }
 
-bool SwCrsrShell::IsEndPara() const
-{   return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetContentNode()->Len(); }
+bool SwCursorShell::IsEndPara() const
+{   return m_pCurrentCursor->GetPoint()->nContent == m_pCurrentCursor->GetContentNode()->Len(); }
 
-bool SwCrsrShell::IsEndOfTable() const
+bool SwCursorShell::IsEndOfTable() const
 {
     if (IsTableMode() || IsBlockMode() || !IsEndPara())
     {
         return false;
     }
-    SwTableNode const*const pTableNode( IsCrsrInTable() );
+    SwTableNode const*const pTableNode( IsCursorInTable() );
     if (!pTableNode)
     {
         return false;
@@ -1098,122 +1098,122 @@ bool SwCrsrShell::IsEndOfTable() const
     SwNodeIndex const lastNode(*pEndTableNode, -2);
     SAL_WARN_IF(!lastNode.GetNode().GetTextNode(), "sw.core",
             "text node expected");
-    return (lastNode == m_pCurCrsr->GetPoint()->nNode);
+    return (lastNode == m_pCurrentCursor->GetPoint()->nNode);
 }
 
-bool SwCrsrShell::IsInFrontOfLabel() const
+bool SwCursorShell::IsInFrontOfLabel() const
 {
-    return m_pCurCrsr->IsInFrontOfLabel();
+    return m_pCurrentCursor->IsInFrontOfLabel();
 }
 
-bool SwCrsrShell::SetInFrontOfLabel( bool bNew )
+bool SwCursorShell::SetInFrontOfLabel( bool bNew )
 {
     if ( bNew != IsInFrontOfLabel() )
     {
-        m_pCurCrsr->_SetInFrontOfLabel( bNew );
+        m_pCurrentCursor->_SetInFrontOfLabel( bNew );
         UpdateMarkedListLevel();
         return true;
     }
     return false;
 }
 
-bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
+bool SwCursorShell::GotoPage( sal_uInt16 nPage )
 {
     SET_CURR_SHELL( this );
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    SwCrsrSaveState aSaveState( *m_pCurCrsr );
-    bool bRet = GetLayout()->SetCurrPage( m_pCurCrsr, nPage ) &&
-                    !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    SwCursorSaveState aSaveState( *m_pCurrentCursor );
+    bool bRet = GetLayout()->SetCurrPage( m_pCurrentCursor, nPage ) &&
+                    !m_pCurrentCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                          nsSwCursorSelOverFlags::SELOVER_CHANGEPOS );
     if( bRet )
-        UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+        UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     return bRet;
 }
 
-bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
+bool SwCursorShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
 {
-    SwContentFrm* pFrm = GetCurrFrm();
-    return pFrm->GetCharRect( rRect, *pPos );
+    SwContentFrame* pFrame = GetCurrFrame();
+    return pFrame->GetCharRect( rRect, *pPos );
 }
 
-void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
-                              bool bAtCrsrPos, const bool bCalcFrm )
+void SwCursorShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
+                              bool bAtCursorPos, const bool bCalcFrame )
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
-    const SwContentFrm* pCFrm;
-    const SwPageFrm *pPg = nullptr;
+    const SwContentFrame* pCFrame;
+    const SwPageFrame *pPg = nullptr;
 
-    if( !bAtCrsrPos || nullptr == (pCFrm = GetCurrFrm( bCalcFrm )) ||
-                       nullptr == (pPg   = pCFrm->FindPageFrm()) )
+    if( !bAtCursorPos || nullptr == (pCFrame = GetCurrFrame( bCalcFrame )) ||
+                       nullptr == (pPg   = pCFrame->FindPageFrame()) )
     {
         pPg = Imp()->GetFirstVisPage(GetOut());
         while( pPg && pPg->IsEmptyPage() )
-            pPg = static_cast<const SwPageFrm *>(pPg->GetNext());
+            pPg = static_cast<const SwPageFrame *>(pPg->GetNext());
     }
     // pPg has to exist with a default of 1 for the special case "Writerstart"
     rnPhyNum  = pPg? pPg->GetPhyPageNum() : 1;
     rnVirtNum = pPg? pPg->GetVirtPageNum() : 1;
 }
 
-sal_uInt16 SwCrsrShell::GetNextPrevPageNum( bool bNext )
+sal_uInt16 SwCursorShell::GetNextPrevPageNum( bool bNext )
 {
     SET_CURR_SHELL( this );
     // page number: first visible page or the one at the cursor
-    const SwPageFrm *pPg = Imp()->GetFirstVisPage(GetOut());
+    const SwPageFrame *pPg = Imp()->GetFirstVisPage(GetOut());
     if( pPg )
     {
-        const SwTwips nPageTop = pPg->Frm().Top();
+        const SwTwips nPageTop = pPg->Frame().Top();
 
         if( bNext )
         {
             // go to next view layout row:
             do
             {
-                pPg = static_cast<const SwPageFrm *>(pPg->GetNext());
+                pPg = static_cast<const SwPageFrame *>(pPg->GetNext());
             }
-            while( pPg && pPg->Frm().Top() == nPageTop );
+            while( pPg && pPg->Frame().Top() == nPageTop );
 
             while( pPg && pPg->IsEmptyPage() )
-                pPg = static_cast<const SwPageFrm *>(pPg->GetNext());
+                pPg = static_cast<const SwPageFrame *>(pPg->GetNext());
         }
         else
         {
             // go to previous view layout row:
             do
             {
-                pPg = static_cast<const SwPageFrm *>(pPg->GetPrev());
+                pPg = static_cast<const SwPageFrame *>(pPg->GetPrev());
             }
-            while( pPg && pPg->Frm().Top() == nPageTop );
+            while( pPg && pPg->Frame().Top() == nPageTop );
 
             while( pPg && pPg->IsEmptyPage() )
-                pPg = static_cast<const SwPageFrm *>(pPg->GetPrev());
+                pPg = static_cast<const SwPageFrame *>(pPg->GetPrev());
         }
     }
     // pPg has to exist with a default of 1 for the special case "Writerstart"
     return pPg ? pPg->GetPhyPageNum() : USHRT_MAX;
 }
 
-sal_uInt16 SwCrsrShell::GetPageCnt()
+sal_uInt16 SwCursorShell::GetPageCnt()
 {
     SET_CURR_SHELL( this );
     // return number of pages
     return GetLayout()->GetPageNum();
 }
 
-OUString SwCrsrShell::getPageRectangles()
+OUString SwCursorShell::getPageRectangles()
 {
     CurrShell aCurr(this);
-    SwRootFrm* pLayout = GetLayout();
+    SwRootFrame* pLayout = GetLayout();
     std::vector<OString> v;
-    for (const SwFrm* pFrm = pLayout->GetLower(); pFrm; pFrm = pFrm->GetNext())
+    for (const SwFrame* pFrame = pLayout->GetLower(); pFrame; pFrame = pFrame->GetNext())
     {
         std::vector<OString> aRectangle
         {
-            OString::number(pFrm->Frm().Left()),
-            OString::number(pFrm->Frm().Top()),
-            OString::number(pFrm->Frm().Width()),
-            OString::number(pFrm->Frm().Height())
+            OString::number(pFrame->Frame().Left()),
+            OString::number(pFrame->Frame().Top()),
+            OString::number(pFrame->Frame().Width()),
+            OString::number(pFrame->Frame().Height())
         };
         v.push_back(comphelper::string::join(", ", aRectangle));
     }
@@ -1221,44 +1221,44 @@ OUString SwCrsrShell::getPageRectangles()
 }
 
 /// go to the next SSelection
-bool SwCrsrShell::GoNextCrsr()
+bool SwCursorShell::GoNextCursor()
 {
-    if( !m_pCurCrsr->IsMultiSelection() )
+    if( !m_pCurrentCursor->IsMultiSelection() )
         return false;
 
     SET_CURR_SHELL( this );
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    m_pCurCrsr = dynamic_cast<SwShellCrsr*>(m_pCurCrsr->GetNext());
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    m_pCurrentCursor = dynamic_cast<SwShellCursor*>(m_pCurrentCursor->GetNext());
 
     // #i24086#: show also all others
     if( !ActionPend() )
     {
-        UpdateCrsr();
-        m_pCurCrsr->Show();
+        UpdateCursor();
+        m_pCurrentCursor->Show();
     }
     return true;
 }
 
 /// go to the previous SSelection
-bool SwCrsrShell::GoPrevCrsr()
+bool SwCursorShell::GoPrevCursor()
 {
-    if( !m_pCurCrsr->IsMultiSelection() )
+    if( !m_pCurrentCursor->IsMultiSelection() )
         return false;
 
     SET_CURR_SHELL( this );
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    m_pCurCrsr = dynamic_cast<SwShellCrsr*>(m_pCurCrsr->GetPrev());
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    m_pCurrentCursor = dynamic_cast<SwShellCursor*>(m_pCurrentCursor->GetPrev());
 
     // #i24086#: show also all others
     if( !ActionPend() )
     {
-        UpdateCrsr();
-        m_pCurCrsr->Show();
+        UpdateCursor();
+        m_pCurrentCursor->Show();
     }
     return true;
 }
 
-void SwCrsrShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect)
+void SwCursorShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRect)
 {
     comphelper::FlagRestorationGuard g(mbSelectAll, StartsWithTable() && ExtendedSelectedAll(/*bFootnotes =*/ false));
     SET_CURR_SHELL( this );
@@ -1268,27 +1268,27 @@ void SwCrsrShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
 
     bool bVis = false;
     // if a cursor is visible then hide the SV cursor
-    if( m_pVisCrsr->IsVisible() && !aRect.IsOver( m_aCharRect ) )
+    if( m_pVisibleCursor->IsVisible() && !aRect.IsOver( m_aCharRect ) )
     {
         bVis = true;
-        m_pVisCrsr->Hide();
+        m_pVisibleCursor->Hide();
     }
 
     // re-paint area
     SwViewShell::Paint(rRenderContext, rRect);
 
-    if( m_bHasFocus && !m_bBasicHideCrsr )
+    if( m_bHasFocus && !m_bBasicHideCursor )
     {
-        SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
+        SwShellCursor* pAktCursor = m_pTableCursor ? m_pTableCursor : m_pCurrentCursor;
 
         if( !ActionPend() )
         {
             // so that right/bottom borders will not be cropped
-            pAktCrsr->Invalidate( VisArea() );
-            pAktCrsr->Show();
+            pAktCursor->Invalidate( VisArea() );
+            pAktCursor->Show();
         }
         else
-            pAktCrsr->Invalidate( aRect );
+            pAktCursor->Invalidate( aRect );
 
     }
 
@@ -1300,18 +1300,18 @@ void SwCrsrShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
             bVis = !pPostItMgr->HasActiveSidebarWin();
     }
 
-    if( m_bSVCrsrVis && bVis ) // also show SV cursor again
-        m_pVisCrsr->Show();
+    if( m_bSVCursorVis && bVis ) // also show SV cursor again
+        m_pVisibleCursor->Show();
 }
 
-void SwCrsrShell::VisPortChgd( const SwRect & rRect )
+void SwCursorShell::VisPortChgd( const SwRect & rRect )
 {
     SET_CURR_SHELL( this );
     bool bVis; // switch off all cursors when scrolling
 
     // if a cursor is visible then hide the SV cursor
-    if( ( bVis = m_pVisCrsr->IsVisible() ) )
-        m_pVisCrsr->Hide();
+    if( ( bVis = m_pVisibleCursor->IsVisible() ) )
+        m_pVisibleCursor->Hide();
 
     m_bVisPortChgd = true;
     m_aOldRBPos.setX(VisArea().Right());
@@ -1322,10 +1322,10 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
     // During painting no selections should be shown, thus the call is encapsulated. <- TODO: old artefact?
     SwViewShell::VisPortChgd( rRect ); // move area
 
-    if( m_bSVCrsrVis && bVis ) // show SV cursor again
-        m_pVisCrsr->Show();
+    if( m_bSVCursorVis && bVis ) // show SV cursor again
+        m_pVisibleCursor->Show();
 
-    if( m_nCrsrMove )
+    if( m_nCursorMove )
         m_bInCMvVisportChgd = true;
 
     m_bVisPortChgd = false;
@@ -1337,24 +1337,24 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
     deleting a border). The new position is calculated from its current position
     in the layout.
 */
-void SwCrsrShell::UpdateCrsrPos()
+void SwCursorShell::UpdateCursorPos()
 {
     SET_CURR_SHELL( this );
     ++mnStartAction;
-    SwShellCrsr* pShellCrsr = getShellCrsr( true );
+    SwShellCursor* pShellCursor = getShellCursor( true );
     Size aOldSz( GetDocSize() );
 
-    if( isInHiddenTextFrm(pShellCrsr) )
+    if( isInHiddenTextFrame(pShellCursor) )
     {
-        SwCrsrMoveState aTmpState( MV_NONE );
+        SwCursorMoveState aTmpState( MV_NONE );
         aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
-        GetLayout()->GetCrsrOfst( pShellCrsr->GetPoint(), pShellCrsr->GetPtPos(),
+        GetLayout()->GetCursorOfst( pShellCursor->GetPoint(), pShellCursor->GetPtPos(),
                                      &aTmpState );
-        pShellCrsr->DeleteMark();
+        pShellCursor->DeleteMark();
     }
     IGrammarContact *pGrammarContact = GetDoc() ? GetDoc()->getGrammarContact() : nullptr;
     if( pGrammarContact )
-        pGrammarContact->updateCursorPosition( *m_pCurCrsr->GetPoint() );
+        pGrammarContact->updateCursorPosition( *m_pCurrentCursor->GetPoint() );
     --mnStartAction;
     if( aOldSz != GetDocSize() )
         SizeChgNotify();
@@ -1368,9 +1368,9 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx )
     if( pSectNd && pSectNd->GetSection().IsHiddenFlag() )
     {
         SwNodeIndex aTmp( *pSectNd );
-        const SwNode* pFrmNd =
-            rIdx.GetNodes().FindPrvNxtFrmNode( aTmp, pSectNd->EndOfSectionNode() );
-        bOk = pFrmNd != nullptr;
+        const SwNode* pFrameNd =
+            rIdx.GetNodes().FindPrvNxtFrameNode( aTmp, pSectNd->EndOfSectionNode() );
+        bOk = pFrameNd != nullptr;
         SAL_WARN_IF(!bOk, "sw", "found no Node with Frames");
         rIdx = aTmp;
     }
@@ -1400,29 +1400,29 @@ static void lcl_CheckHiddenPara( SwPosition& rPos )
 class SwNotifyAccAboutInvalidTextSelections
 {
     private:
-        SwCrsrShell& mrCrsrSh;
+        SwCursorShell& mrCursorSh;
 
     public:
-        explicit SwNotifyAccAboutInvalidTextSelections( SwCrsrShell& _rCrsrSh )
-            : mrCrsrSh( _rCrsrSh )
+        explicit SwNotifyAccAboutInvalidTextSelections( SwCursorShell& _rCursorSh )
+            : mrCursorSh( _rCursorSh )
         {}
 
         ~SwNotifyAccAboutInvalidTextSelections()
         {
-            mrCrsrSh.InvalidateAccessibleParaTextSelection();
+            mrCursorSh.InvalidateAccessibleParaTextSelection();
         }
 };
 
-void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
+void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
 {
     SET_CURR_SHELL( this );
-    ClearUpCrsrs();
+    ClearUpCursors();
 
     // In a BasicAction the cursor must be updated, e.g. to create the
-    // TableCursor. EndAction now calls UpdateCrsr!
+    // TableCursor. EndAction now calls UpdateCursor!
     if( ActionPend() && BasicActionPend() )
     {
-        if ( eFlags & SwCrsrShell::READONLY )
+        if ( eFlags & SwCursorShell::READONLY )
             m_bIgnoreReadonly = true;
         return; // if not then no update
     }
@@ -1432,70 +1432,70 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
     if ( m_bIgnoreReadonly )
     {
         m_bIgnoreReadonly = false;
-        eFlags |= SwCrsrShell::READONLY;
+        eFlags |= SwCursorShell::READONLY;
     }
 
-    if( eFlags & SwCrsrShell::CHKRANGE )    // check all cursor moves for
-        CheckRange( m_pCurCrsr );             // overlapping ranges
+    if( eFlags & SwCursorShell::CHKRANGE )    // check all cursor moves for
+        CheckRange( m_pCurrentCursor );             // overlapping ranges
 
     if( !bIdleEnd )
         CheckTableBoxContent();
 
     // If the current cursor is in a table and point/mark in different boxes,
-    // then the table mode is active (also if it is already active: m_pTableCrsr)
-    SwPaM* pTstCrsr = getShellCrsr( true );
-    if( pTstCrsr->HasMark() && !m_pBlockCrsr &&
-        mpDoc->IsIdxInTable( pTstCrsr->GetPoint()->nNode ) &&
-          ( m_pTableCrsr ||
-            pTstCrsr->GetNode().StartOfSectionNode() !=
-            pTstCrsr->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll)
-    {
-        SwShellCrsr* pITmpCrsr = getShellCrsr( true );
-        Point aTmpPt( pITmpCrsr->GetPtPos() );
-        Point aTmpMk( pITmpCrsr->GetMkPos() );
-        SwPosition* pPos = pITmpCrsr->GetPoint();
+    // then the table mode is active (also if it is already active: m_pTableCursor)
+    SwPaM* pTstCursor = getShellCursor( true );
+    if( pTstCursor->HasMark() && !m_pBlockCursor &&
+        mpDoc->IsIdxInTable( pTstCursor->GetPoint()->nNode ) &&
+          ( m_pTableCursor ||
+            pTstCursor->GetNode().StartOfSectionNode() !=
+            pTstCursor->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll)
+    {
+        SwShellCursor* pITmpCursor = getShellCursor( true );
+        Point aTmpPt( pITmpCursor->GetPtPos() );
+        Point aTmpMk( pITmpCursor->GetMkPos() );
+        SwPosition* pPos = pITmpCursor->GetPoint();
 
         // Bug 65475 (1999) - if Point/Mark in hidden sections, move them out
         lcl_CheckHiddenSection( pPos->nNode );
-        lcl_CheckHiddenSection( pITmpCrsr->GetMark()->nNode );
+        lcl_CheckHiddenSection( pITmpCursor->GetMark()->nNode );
 
         // Move cursor out of hidden paragraphs
         if ( !GetViewOptions()->IsShowHiddenChar() )
         {
             lcl_CheckHiddenPara( *pPos );
-            lcl_CheckHiddenPara( *pITmpCrsr->GetMark() );
+            lcl_CheckHiddenPara( *pITmpCursor->GetMark() );
         }
 
-        SwContentFrm *pTableFrm = pPos->nNode.GetNode().GetContentNode()->
-                              getLayoutFrm( GetLayout(), &aTmpPt, pPos, false );
+        SwContentFrame *pTableFrame = pPos->nNode.GetNode().GetContentNode()->
+                              getLayoutFrame( GetLayout(), &aTmpPt, pPos, false );
 
-        OSL_ENSURE( pTableFrm, "Tabelle Crsr nicht im Content ??" );
+        OSL_ENSURE( pTableFrame, "Tabelle Cursor nicht im Content ??" );
 
         // --> Make code robust. The table cursor may point
         // to a table in a currently inactive header.
-        SwTabFrm *pTab = pTableFrm ? pTableFrm->FindTabFrm() : nullptr;
+        SwTabFrame *pTab = pTableFrame ? pTableFrame->FindTabFrame() : nullptr;
 
         if ( pTab && pTab->GetTable()->GetRowsToRepeat() > 0 )
         {
             // First check if point is in repeated headline:
-            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTableFrm );
+            bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTableFrame );
 
             // Second check if mark is in repeated headline:
             if ( !bInRepeatedHeadline )
             {
-                SwContentFrm* pMarkTableFrm = pITmpCrsr->GetContentNode( false )->
-                    getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), false );
-                OSL_ENSURE( pMarkTableFrm, "Tabelle Crsr nicht im Content ??" );
+                SwContentFrame* pMarkTableFrame = pITmpCursor->GetContentNode( false )->
+                    getLayoutFrame( GetLayout(), &aTmpMk, pITmpCursor->GetMark(), false );
+                OSL_ENSURE( pMarkTableFrame, "Tabelle Cursor nicht im Content ??" );
 
-                if ( pMarkTableFrm )
+                if ( pMarkTableFrame )
                 {
-                    SwTabFrm* pMarkTab = pMarkTableFrm->FindTabFrm();
-                    OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
+                    SwTabFrame* pMarkTab = pMarkTableFrame->FindTabFrame();
+                    OSL_ENSURE( pMarkTab, "Tabelle Cursor nicht im Content ??" );
 
                     // Make code robust:
                     if ( pMarkTab )
                     {
-                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTableFrm );
+                        bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTableFrame );
                     }
                 }
             }
@@ -1503,40 +1503,40 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
             // No table cursor in repeated headlines:
             if ( bInRepeatedHeadline )
             {
-                pTableFrm = nullptr;
+                pTableFrame = nullptr;
 
-                SwPosSection fnPosSect = *pPos <  *pITmpCrsr->GetMark()
+                SwPosSection fnPosSect = *pPos <  *pITmpCursor->GetMark()
                                             ? fnSectionStart
                                             : fnSectionEnd;
 
                 // then only select inside the Box
-                if( m_pTableCrsr )
+                if( m_pTableCursor )
                 {
-                    m_pCurCrsr->SetMark();
-                    *m_pCurCrsr->GetMark() = *m_pTableCrsr->GetMark();
-                    m_pCurCrsr->GetMkPos() = m_pTableCrsr->GetMkPos();
-                    m_pTableCrsr->DeleteMark();
-                    m_pTableCrsr->SwSelPaintRects::Hide();
+                    m_pCurrentCursor->SetMark();
+                    *m_pCurrentCursor->GetMark() = *m_pTableCursor->GetMark();
+                    m_pCurrentCursor->GetMkPos() = m_pTableCursor->GetMkPos();
+                    m_pTableCursor->DeleteMark();
+                    m_pTableCursor->SwSelPaintRects::Hide();
                 }
 
-                *m_pCurCrsr->GetPoint() = *m_pCurCrsr->GetMark();
-                (*fnSectionCurr)( *m_pCurCrsr, fnPosSect );
+                *m_pCurrentCursor->GetPoint() = *m_pCurrentCursor->GetMark();
+                (*fnSectionCurr)( *m_pCurrentCursor, fnPosSect );
             }
         }
 
         // we really want a table selection
-        if( pTab && pTableFrm )
+        if( pTab && pTableFrame )
         {
-            if( !m_pTableCrsr )
+            if( !m_pTableCursor )
             {
-                m_pTableCrsr = new SwShellTableCrsr( *this,
-                                *m_pCurCrsr->GetMark(), m_pCurCrsr->GetMkPos(),
+                m_pTableCursor = new SwShellTableCursor( *this,
+                                *m_pCurrentCursor->GetMark(), m_pCurrentCursor->GetMkPos(),
                                 *pPos, aTmpPt );
-                m_pCurCrsr->DeleteMark();
-                m_pCurCrsr->SwSelPaintRects::Hide();
+                m_pCurrentCursor->DeleteMark();
+                m_pCurrentCursor->SwSelPaintRects::Hide();
 
                 CheckTableBoxContent();
-                if(!m_pTableCrsr)
+                if(!m_pTableCursor)
                 {
                     SAL_WARN("sw", "fdo#74854: "
                         "this should not happen, but better lose the selection "
@@ -1545,76 +1545,76 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                 }
             }
 
-            SwCrsrMoveState aTmpState( MV_NONE );
+            SwCursorMoveState aTmpState( MV_NONE );
             aTmpState.m_bRealHeight = true;
-            if( !pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint(), &aTmpState ) )
+            if( !pTableFrame->GetCharRect( m_aCharRect, *m_pTableCursor->GetPoint(), &aTmpState ) )
             {
                 Point aCentrPt( m_aCharRect.Center() );
                 aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
-                pTableFrm->GetCrsrOfst( m_pTableCrsr->GetPoint(), aCentrPt, &aTmpState );
+                pTableFrame->GetCursorOfst( m_pTableCursor->GetPoint(), aCentrPt, &aTmpState );
                 bool const bResult =
-                    pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint() );
+                    pTableFrame->GetCharRect( m_aCharRect, *m_pTableCursor->GetPoint() );
                 OSL_ENSURE( bResult, "GetCharRect failed." );
                 (void) bResult; // non-debug: unused
             }
 
-            m_pVisCrsr->Hide(); // always hide visible Cursor
+            m_pVisibleCursor->Hide(); // always hide visible Cursor
             // scroll Cursor to visible area
-            if( (eFlags & SwCrsrShell::SCROLLWIN) &&
-                (HasSelection() || eFlags & SwCrsrShell::READONLY ||
-                 !IsCrsrReadonly()) )
+            if( (eFlags & SwCursorShell::SCROLLWIN) &&
+                (HasSelection() || eFlags & SwCursorShell::READONLY ||
+                 !IsCursorReadonly()) )
             {
-                SwFrm* pBoxFrm = pTableFrm;
-                while( pBoxFrm && !pBoxFrm->IsCellFrm() )
-                    pBoxFrm = pBoxFrm->GetUpper();
-                if( pBoxFrm && pBoxFrm->Frm().HasArea() )
-                    MakeVisible( pBoxFrm->Frm() );
+                SwFrame* pBoxFrame = pTableFrame;
+                while( pBoxFrame && !pBoxFrame->IsCellFrame() )
+                    pBoxFrame = pBoxFrame->GetUpper();
+                if( pBoxFrame && pBoxFrame->Frame().HasArea() )
+                    MakeVisible( pBoxFrame->Frame() );
                 else
                     MakeVisible( m_aCharRect );
             }
 
             // let Layout create the Cursors in the Boxes
-            if( m_pTableCrsr->IsCrsrMovedUpdate() )
-                GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
-            if( m_bHasFocus && !m_bBasicHideCrsr )
-                m_pTableCrsr->Show();
+            if( m_pTableCursor->IsCursorMovedUpdate() )
+                GetLayout()->MakeTableCursors( *m_pTableCursor );
+            if( m_bHasFocus && !m_bBasicHideCursor )
+                m_pTableCursor->Show();
 
             // set Cursor-Points to the new Positions
-            m_pTableCrsr->GetPtPos().setX(m_aCharRect.Left());
-            m_pTableCrsr->GetPtPos().setY(m_aCharRect.Top());
+            m_pTableCursor->GetPtPos().setX(m_aCharRect.Left());
+            m_pTableCursor->GetPtPos().setY(m_aCharRect.Top());
 
-            if( m_bSVCrsrVis )
+            if( m_bSVCursorVis )
             {
-                m_aCrsrHeight.setX(0);
-                m_aCrsrHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
+                m_aCursorHeight.setX(0);
+                m_aCursorHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
                                   -m_aCharRect.Width() : m_aCharRect.Height());
-                m_pVisCrsr->Show(); // show again
+                m_pVisibleCursor->Show(); // show again
             }
-            m_eMvState = MV_NONE;  // state for cursor travelling - GetCrsrOfst
-            if( pTableFrm && Imp()->IsAccessible() )
-                Imp()->InvalidateAccessibleCursorPosition( pTableFrm );
+            m_eMvState = MV_NONE;  // state for cursor travelling - GetCursorOfst
+            if( pTableFrame && Imp()->IsAccessible() )
+                Imp()->InvalidateAccessibleCursorPosition( pTableFrame );
             return;
         }
     }
 
-    if( m_pTableCrsr )
+    if( m_pTableCursor )
     {
         // delete Ring
-        while( m_pCurCrsr->GetNext() != m_pCurCrsr )
-            delete m_pCurCrsr->GetNext();
-        m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
-        m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
-        delete m_pTableCrsr, m_pTableCrsr = nullptr;
+        while( m_pCurrentCursor->GetNext() != m_pCurrentCursor )
+            delete m_pCurrentCursor->GetNext();
+        m_pCurrentCursor->DeleteMark();
+        *m_pCurrentCursor->GetPoint() = *m_pTableCursor->GetPoint();
+        m_pCurrentCursor->GetPtPos() = m_pTableCursor->GetPtPos();
+        delete m_pTableCursor, m_pTableCursor = nullptr;
     }
 
-    m_pVisCrsr->Hide(); // always hide visible Cursor
+    m_pVisibleCursor->Hide(); // always hide visible Cursor
 
     // are we perhaps in a protected / hidden Section ?
     {
-        SwShellCrsr* pShellCrsr = getShellCrsr( true );
+        SwShellCursor* pShellCursor = getShellCursor( true );
         bool bChgState = true;
-        const SwSectionNode* pSectNd = pShellCrsr->GetNode().FindSectionNode();
+        const SwSectionNode* pSectNd = pShellCursor->GetNode().FindSectionNode();
         if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
             ( !IsReadOnlyAvailable() &&
               pSectNd->GetSection().IsProtectFlag() &&
@@ -1654,14 +1654,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         }
     }
 
-    UpdateCrsrPos();
+    UpdateCursorPos();
 
     // The cursor must always point into content; there's some code
     // that relies on this. (E.g. in SwEditShell::GetScriptType, which always
     // loops _behind_ the last node in the selection, which always works if you
     // are in content.) To achieve this, we'll force cursor(s) to point into
-    // content, if UpdateCrsrPos() hasn't already done so.
-    for(SwPaM& rCmp : m_pCurCrsr->GetRingContainer())
+    // content, if UpdateCursorPos() hasn't already done so.
+    for(SwPaM& rCmp : m_pCurrentCursor->GetRingContainer())
     {
         // start will move forwards, end will move backwards
         bool bPointIsStart = ( rCmp.Start() == rCmp.GetPoint() );
@@ -1686,33 +1686,33 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
 
     SwRect aOld( m_aCharRect );
     bool bFirst = true;
-    SwContentFrm *pFrm;
+    SwContentFrame *pFrame;
     int nLoopCnt = 100;
-    SwShellCrsr* pShellCrsr = getShellCrsr( true );
+    SwShellCursor* pShellCursor = getShellCursor( true );
 
     do {
         bool bAgainst;
         do {
             bAgainst = false;
-            pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
-                        &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
-            // if the Frm doesn't exist anymore, the complete Layout has to be
-            // created, because there used to be a Frm here!
-            if ( !pFrm )
+            pFrame = pShellCursor->GetContentNode()->getLayoutFrame( GetLayout(),
+                        &pShellCursor->GetPtPos(), pShellCursor->GetPoint(), false );
+            // if the Frame doesn't exist anymore, the complete Layout has to be
+            // created, because there used to be a Frame here!
+            if ( !pFrame )
             {
                 do
                 {
                     CalcLayout();
-                    pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
-                                &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
-                }  while( !pFrm );
+                    pFrame = pShellCursor->GetContentNode()->getLayoutFrame( GetLayout(),
+                                &pShellCursor->GetPtPos(), pShellCursor->GetPoint(), false );
+                }  while( !pFrame );
             }
             else if ( Imp()->IsIdleAction() )
                 // Guarantee everything's properly formatted
-                pFrm->PrepareCrsr();
+                pFrame->PrepareCursor();
 
             // In protected Fly? but ignore in case of frame selection
-            if( !IsReadOnlyAvailable() && pFrm->IsProtected() &&
+            if( !IsReadOnlyAvailable() && pFrame->IsProtected() &&
                 ( !Imp()->GetDrawView() ||
                   !Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ) &&
                 (!mpDoc->GetDocShell() ||
@@ -1750,40 +1750,40 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
                         CallChgLnk();       // notify UI!
                     }
                     m_bAllProtect = false;
-                    bAgainst = true; // look for the right Frm again
+                    bAgainst = true; // look for the right Frame again
                 }
             }
         } while( bAgainst );
 
-        SwCrsrMoveState aTmpState( m_eMvState );
+        SwCursorMoveState aTmpState( m_eMvState );
         aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
         aTmpState.m_bRealHeight = true;
-        aTmpState.m_bRealWidth = IsOverwriteCrsr();
-        aTmpState.m_nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
+        aTmpState.m_bRealWidth = IsOverwriteCursor();
+        aTmpState.m_nCursorBidiLevel = pShellCursor->GetCursorBidiLevel();
 
         // #i27615#,#i30453#
         SwSpecialPos aSpecialPos;
         aSpecialPos.nExtendRange = SwSPExtendRange::BEFORE;
-        if (pShellCrsr->IsInFrontOfLabel())
+        if (pShellCursor->IsInFrontOfLabel())
         {
             aTmpState.m_pSpecialPos = &aSpecialPos;
         }
 
         ++mnStartAction; // tdf#91602 prevent recursive Action!
-        if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) )
+        if( !pFrame->GetCharRect( m_aCharRect, *pShellCursor->GetPoint(), &aTmpState ) )
         {
-            Point& rPt = pShellCrsr->GetPtPos();
+            Point& rPt = pShellCursor->GetPtPos();
             rPt = m_aCharRect.Center();
-            pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
+            pFrame->GetCursorOfst( pShellCursor->GetPoint(), rPt, &aTmpState );
         }
         --mnStartAction;
 
-        if( !pShellCrsr->HasMark() )
-            m_aCrsrHeight = aTmpState.m_aRealHeight;
+        if( !pShellCursor->HasMark() )
+            m_aCursorHeight = aTmpState.m_aRealHeight;
         else
         {
-            m_aCrsrHeight.setX(0);
-            m_aCrsrHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
+            m_aCursorHeight.setX(0);
+            m_aCursorHeight.setY(aTmpState.m_aRealHeight.getY() < 0 ?
                               -m_aCharRect.Width() : m_aCharRect.Height());
         }
 
@@ -1802,64 +1802,64 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         bFirst = false;
 
         // update cursor Points to the new Positions
-        pShellCrsr->GetPtPos().setX(m_aCharRect.Left());
-        pShellCrsr->GetPtPos().setY(m_aCharRect.Top());
+        pShellCursor->GetPtPos().setX(m_aCharRect.Left());
+        pShellCursor->GetPtPos().setY(m_aCharRect.Top());
 
-        if( !(eFlags & SwCrsrShell::UPDOWN ))   // delete old Pos. of Up/Down
+        if( !(eFlags & SwCursorShell::UPDOWN ))   // delete old Pos. of Up/Down
         {
-            pFrm->Calc(GetOut());
-            m_nUpDownX = pFrm->IsVertical() ?
-                       m_aCharRect.Top() - pFrm->Frm().Top() :
-                       m_aCharRect.Left() - pFrm->Frm().Left();
+            pFrame->Calc(GetOut());
+            m_nUpDownX = pFrame->IsVertical() ?
+                       m_aCharRect.Top() - pFrame->Frame().Top() :
+                       m_aCharRect.Left() - pFrame->Frame().Left();
         }
 
         // scroll Cursor to visible area
-        if( m_bHasFocus && eFlags & SwCrsrShell::SCROLLWIN &&
-            (HasSelection() || eFlags & SwCrsrShell::READONLY ||
-             !IsCrsrReadonly() || GetViewOptions()->IsSelectionInReadonly()) )
+        if( m_bHasFocus && eFlags & SwCursorShell::SCROLLWIN &&
+            (HasSelection() || eFlags & SwCursorShell::READONLY ||
+             !IsCursorReadonly() || GetViewOptions()->IsSelectionInReadonly()) )
         {
             // in case of scrolling this EndAction doesn't show the SV cursor
             // again, thus save and reset the flag here
-            bool bSav = m_bSVCrsrVis;
-            m_bSVCrsrVis = false;
+            bool bSav = m_bSVCursorVis;
+            m_bSVCursorVis = false;
             MakeSelVisible();
-            m_bSVCrsrVis = bSav;
+            m_bSVCursorVis = bSav;
         }
 
-    } while( eFlags & SwCrsrShell::SCROLLWIN );
+    } while( eFlags & SwCursorShell::SCROLLWIN );
 
-    if( m_pBlockCrsr )
+    if( m_pBlockCursor )
         RefreshBlockCursor();
 
-    if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCrsr )
+    if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCursor )
     {
-        if( m_pTableCrsr )
-            m_pTableCrsr->SwSelPaintRects::Show();
+        if( m_pTableCursor )
+            m_pTableCursor->SwSelPaintRects::Show();
         else
         {
-            m_pCurCrsr->SwSelPaintRects::Show();
-            if( m_pBlockCrsr )
+            m_pCurrentCursor->SwSelPaintRects::Show();
+            if( m_pBlockCursor )
             {
-                SwShellCrsr* pNxt = dynamic_cast<SwShellCrsr*>(m_pCurCrsr->GetNext());
-                while( pNxt && pNxt != m_pCurCrsr )
+                SwShellCursor* pNxt = dynamic_cast<SwShellCursor*>(m_pCurrentCursor->GetNext());
+                while( pNxt && pNxt != m_pCurrentCursor )
                 {
                     pNxt->SwSelPaintRects::Show();
-                    pNxt = dynamic_cast<SwShellCrsr*>(pNxt->GetNext());
+                    pNxt = dynamic_cast<SwShellCursor*>(pNxt->GetNext());
                 }
             }
         }
     }
 
-    m_eMvState = MV_NONE; // state for cursor tavelling - GetCrsrOfst
+    m_eMvState = MV_NONE; // state for cursor tavelling - GetCursorOfst
 
-    if( pFrm && Imp()->IsAccessible() )
-        Imp()->InvalidateAccessibleCursorPosition( pFrm );
+    if( pFrame && Imp()->IsAccessible() )
+        Imp()->InvalidateAccessibleCursorPosition( pFrame );
 
     // switch from blinking cursor to read-only-text-selection cursor
     const sal_uInt64 nBlinkTime = GetOut()->GetSettings().GetStyleSettings().
                             GetCursorBlinkTime();
 
-    if ( (IsCrsrReadonly() && GetViewOptions()->IsSelectionInReadonly()) ==
+    if ( (IsCursorReadonly() && GetViewOptions()->IsSelectionInReadonly()) ==
         ( nBlinkTime != STYLE_CURSOR_NOBLINKTIME ) )
     {
         // non blinking cursor in read only - text selection mode
@@ -1873,195 +1873,195 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
         GetOut()->SetSettings( aSettings );
     }
 
-    if( m_bSVCrsrVis )
-        m_pVisCrsr->Show(); // show again
+    if( m_bSVCursorVis )
+        m_pVisibleCursor->Show(); // show again
 }
 
-void SwCrsrShell::RefreshBlockCursor()
+void SwCursorShell::RefreshBlockCursor()
 {
-    OSL_ENSURE( m_pBlockCrsr, "Don't call me without a block cursor" );
-    SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
+    OSL_ENSURE( m_pBlockCursor, "Don't call me without a block cursor" );
+    SwShellCursor &rBlock = m_pBlockCursor->getShellCursor();
     Point aPt = rBlock.GetPtPos();
-    SwContentFrm* pFrm = rBlock.GetContentNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
+    SwContentFrame* pFrame = rBlock.GetContentNode()->getLayoutFrame( GetLayout(), &aPt, rBlock.GetPoint(), false );
     Point aMk;
-    if( m_pBlockCrsr->getEndPoint() && m_pBlockCrsr->getStartPoint() )
+    if( m_pBlockCursor->getEndPoint() && m_pBlockCursor->getStartPoint() )
     {
-        aPt = *m_pBlockCrsr->getStartPoint();
-        aMk = *m_pBlockCrsr->getEndPoint();
+        aPt = *m_pBlockCursor->getStartPoint();
+        aMk = *m_pBlockCursor->getEndPoint();
     }
     else
     {
         aPt = rBlock.GetPtPos();
-        if( pFrm )
+        if( pFrame )
         {
-            if( pFrm->IsVertical() )
-                aPt.setY(pFrm->Frm().Top() + GetUpDownX());
+            if( pFrame->IsVertical() )
+                aPt.setY(pFrame->Frame().Top() + GetUpDownX());
             else
-                aPt.setX(pFrm->Frm().Left() + GetUpDownX());
+                aPt.setX(pFrame->Frame().Left() + GetUpDownX());
         }
         aMk = rBlock.GetMkPos();
     }
     SwRect aRect( aMk, aPt );
     aRect.Justify();
-    SwSelectionList aSelList( pFrm );
+    SwSelectionList aSelList( pFrame );
 
     if( GetLayout()->FillSelection( aSelList, aRect ) )
     {
-        SwCursor* pNxt = static_cast<SwCursor*>(m_pCurCrsr->GetNext());
-        while( pNxt != m_pCurCrsr )
+        SwCursor* pNxt = static_cast<SwCursor*>(m_pCurrentCursor->GetNext());
+        while( pNxt != m_pCurrentCursor )
         {
             delete pNxt;
-            pNxt = static_cast<SwCursor*>(m_pCurCrsr->GetNext());
+            pNxt = static_cast<SwCursor*>(m_pCurrentCursor->GetNext());
         }
 
         std::list<SwPaM*>::iterator pStart = aSelList.getStart();
         std::list<SwPaM*>::iterator pPam = aSelList.getEnd();
         OSL_ENSURE( pPam != pStart, "FillSelection should deliver at least one PaM" );
-        m_pCurCrsr->SetMark();
+        m_pCurrentCursor->SetMark();
         --pPam;
         // If there is only one text portion inside the rectangle, a simple
         // selection is created
         if( pPam == pStart )
         {
-            *m_pCurCrsr->GetPoint() = *(*pPam)->GetPoint();
+            *m_pCurrentCursor->GetPoint() = *(*pPam)->GetPoint();
             if( (*pPam)->HasMark() )
-                *m_pCurCrsr->GetMark() = *(*pPam)->GetMark();
+                *m_pCurrentCursor->GetMark() = *(*pPam)->GetMark();
             else
-                m_pCurCrsr->DeleteMark();
+                m_pCurrentCursor->DeleteMark();
             delete *pPam;
-            m_pCurCrsr->SetColumnSelection( false );
+            m_pCurrentCursor->SetColumnSelection( false );
         }
         else
         {
             // The order of the SwSelectionList has to be preserved but
-            // the order inside the ring created by CreateCrsr() is not like
+            // the order inside the ring created by CreateCursor() is not like
             // expected => First create the selections before the last one
             // downto the first selection.
             // At least create the cursor for the last selection
             --pPam;
-            *m_pCurCrsr->GetPoint() = *(*pPam)->GetPoint(); // n-1 (if n == number of selections)
+            *m_pCurrentCursor->GetPoint() = *(*pPam)->GetPoint(); // n-1 (if n == number of selections)
             if( (*pPam)->HasMark() )
-                *m_pCurCrsr->GetMark() = *(*pPam)->GetMark();
+                *m_pCurrentCursor->GetMark() = *(*pPam)->GetMark();
             else
-                m_pCurCrsr->DeleteMark();
+                m_pCurrentCursor->DeleteMark();
             delete *pPam;
-            m_pCurCrsr->SetColumnSelection( true );
+            m_pCurrentCursor->SetColumnSelection( true );
             while( pPam != pStart )
             {
                 --pPam;
 
-                SwShellCrsr* pNew = new SwShellCrsr( *m_pCurCrsr );
-                pNew->insert( pNew->begin(), m_pCurCrsr->begin(),  m_pCurCrsr->end());
-                m_pCurCrsr->clear();
-                m_pCurCrsr->DeleteMark();
+                SwShellCursor* pNew = new SwShellCursor( *m_pCurrentCursor );
+                pNew->insert( pNew->begin(), m_pCurrentCursor->begin(),  m_pCurrentCursor->end());
+                m_pCurrentCursor->clear();
+                m_pCurrentCursor->DeleteMark();
 
-                *m_pCurCrsr->GetPoint() = *(*pPam)->GetPoint(); // n-2, n-3, .., 2, 1
+                *m_pCurrentCursor->GetPoint() = *(*pPam)->GetPoint(); // n-2, n-3, .., 2, 1
                 if( (*pPam)->HasMark() )
                 {
-                    m_pCurCrsr->SetMark();
-                    *m_pCurCrsr->GetMark() = *(*pPam)->GetMark();
+                    m_pCurrentCursor->SetMark();
+                    *m_pCurrentCursor->GetMark() = *(*pPam)->GetMark();
                 }
                 else
-                    m_pCurCrsr->DeleteMark();
-                m_pCurCrsr->SetColumnSelection( true );
+                    m_pCurrentCursor->DeleteMark();
+                m_pCurrentCursor->SetColumnSelection( true );
                 delete *pPam;
             }
             {
-                SwShellCrsr* pNew = new SwShellCrsr( *m_pCurCrsr );
-                pNew->insert( pNew->begin(), m_pCurCrsr->begin(), m_pCurCrsr->end() );
-                m_pCurCrsr->clear();
-                m_pCurCrsr->DeleteMark();
+                SwShellCursor* pNew = new SwShellCursor( *m_pCurrentCursor );
+                pNew->insert( pNew->begin(), m_pCurrentCursor->begin(), m_pCurrentCursor->end() );
+                m_pCurrentCursor->clear();
+                m_pCurrentCursor->DeleteMark();
             }
             pPam = aSelList.getEnd();
             --pPam;
-            *m_pCurCrsr->GetPoint() = *(*pPam)->GetPoint(); // n, the last selection
+            *m_pCurrentCursor->GetPoint() = *(*pPam)->GetPoint(); // n, the last selection
             if( (*pPam)->HasMark() )
             {
-                m_pCurCrsr->SetMark();
-                *m_pCurCrsr->GetMark() = *(*pPam)->GetMark();
+                m_pCurrentCursor->SetMark();
+                *m_pCurrentCursor->GetMark() = *(*pPam)->GetMark();
             }
             else
-                m_pCurCrsr->DeleteMark();
-            m_pCurCrsr->SetColumnSelection( true );
+                m_pCurrentCursor->DeleteMark();
+            m_pCurrentCursor->SetColumnSelection( true );
             delete *pPam;
         }
     }
 }
 
 /// create a copy of the cursor and save it in the stack
-void SwCrsrShell::Push()
+void SwCursorShell::Push()
 {
     // fdo#60513: if we have a table cursor, copy that; else copy current.
-    // This seems to work because UpdateCrsr() will fix this up on Pop(),
-    // then MakeBoxSels() will re-create the current m_pCurCrsr cell ring.
-    SwShellCrsr *const pCurrent((m_pTableCrsr) ? m_pTableCrsr : m_pCurCrsr);
-    m_pCrsrStk = new SwShellCrsr( *this, *pCurrent->GetPoint(),
-                                    pCurrent->GetPtPos(), m_pCrsrStk );
+    // This seems to work because UpdateCursor() will fix this up on Pop(),
+    // then MakeBoxSels() will re-create the current m_pCurrentCursor cell ring.
+    SwShellCursor *const pCurrent((m_pTableCursor) ? m_pTableCursor : m_pCurrentCursor);
+    m_pCursorStack = new SwShellCursor( *this, *pCurrent->GetPoint(),
+                                    pCurrent->GetPtPos(), m_pCursorStack );
 
     if (pCurrent->HasMark())
     {
-        m_pCrsrStk->SetMark();
-        *m_pCrsrStk->GetMark() = *pCurrent->GetMark();
+        m_pCursorStack->SetMark();
+        *m_pCursorStack->GetMark() = *pCurrent->GetMark();
     }
 }
 
 /** delete cursor
 
-    @param bOldCrsr If <true> so delete from stack, if <false> delete current
+    @param bOldCursor If <true> so delete from stack, if <false> delete current
                     and assign the one from stack as the new current cursor.
     @return <true> if there was one on the stack, <false> otherwise
 */
-bool SwCrsrShell::Pop( bool bOldCrsr )
+bool SwCursorShell::Pop( bool bOldCursor )
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
 
     // are there any left?
-    if( nullptr == m_pCrsrStk )
+    if( nullptr == m_pCursorStack )
         return false;
 
-    SwShellCrsr *pTmp = nullptr, *pOldStk = m_pCrsrStk;
+    SwShellCursor *pTmp = nullptr, *pOldStack = m_pCursorStack;
 
     // the successor becomes the current one
-    if( m_pCrsrStk->GetNext() != m_pCrsrStk )
+    if( m_pCursorStack->GetNext() != m_pCursorStack )
     {
-        pTmp = dynamic_cast<SwShellCrsr*>(m_pCrsrStk->GetNext());
+        pTmp = dynamic_cast<SwShellCursor*>(m_pCursorStack->GetNext());
     }
 
-    if( bOldCrsr ) // delete from stack
-        delete m_pCrsrStk;
+    if( bOldCursor ) // delete from stack
+        delete m_pCursorStack;
 
-    m_pCrsrStk = pTmp; // assign new one
+    m_pCursorStack = pTmp; // assign new one
 
-    if( !bOldCrsr )
+    if( !bOldCursor )
     {
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
         // If the visible SSelection was not changed
-        const Point& rPoint = pOldStk->GetPtPos();
-        if (rPoint == m_pCurCrsr->GetPtPos() || rPoint == m_pCurCrsr->GetMkPos())
+        const Point& rPoint = pOldStack->GetPtPos();
+        if (rPoint == m_pCurrentCursor->GetPtPos() || rPoint == m_pCurrentCursor->GetMkPos())
         {
             // move "Selections Rectangles"
-            m_pCurCrsr->insert( m_pCurCrsr->begin(), pOldStk->begin(), pOldStk->end() );
-            pOldStk->clear();
+            m_pCurrentCursor->insert( m_pCurrentCursor->begin(), pOldStack->begin(), pOldStack->end() );
+            pOldStack->clear();
         }
 
-        if( pOldStk->HasMark() )
+        if( pOldStack->HasMark() )
         {
-            m_pCurCrsr->SetMark();
-            *m_pCurCrsr->GetMark() = *pOldStk->GetMark();
-            m_pCurCrsr->GetMkPos() = pOldStk->GetMkPos();
+            m_pCurrentCursor->SetMark();
+            *m_pCurrentCursor->GetMark() = *pOldStack->GetMark();
+            m_pCurrentCursor->GetMkPos() = pOldStack->GetMkPos();
         }
         else
             // no selection so revoke old one and set to old position
-            m_pCurCrsr->DeleteMark();
-        *m_pCurCrsr->GetPoint() = *pOldStk->GetPoint();
-        m_pCurCrsr->GetPtPos() = pOldStk->GetPtPos();
-        delete pOldStk;
+            m_pCurrentCursor->DeleteMark();
+        *m_pCurrentCursor->GetPoint() = *pOldStack->GetPoint();
+        m_pCurrentCursor->GetPtPos() = pOldStack->GetPtPos();
+        delete pOldStack;
 
-        if( !m_pCurCrsr->IsInProtectTable( true ) &&
-            !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+        if( !m_pCurrentCursor->IsInProtectTable( true ) &&
+            !m_pCurrentCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                  nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
-            UpdateCrsr(); // update current cursor
+            UpdateCursor(); // update current cursor
     }
     return true;
 }
@@ -2070,75 +2070,75 @@ bool SwCrsrShell::Pop( bool bOldCrsr )
 
     Delete topmost from stack and use its GetMark in the current.
 */
-void SwCrsrShell::Combine()
+void SwCursorShell::Combine()
 {
     // any others left?
-    if( nullptr == m_pCrsrStk )
+    if( nullptr == m_pCursorStack )
         return;
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
     // rhbz#689053: IsSelOvr must restore the saved stack position, not the
     // current one, because current point + stack mark may be invalid PaM
-    SwCrsrSaveState aSaveState(*m_pCrsrStk);
+    SwCursorSaveState aSaveState(*m_pCursorStack);
     // stack cursor & current cursor in same Section?
-    assert(!m_pCrsrStk->HasMark() ||
-            CheckNodesRange(m_pCrsrStk->GetMark()->nNode,
-                            m_pCurCrsr->GetPoint()->nNode, true));
-    *m_pCrsrStk->GetPoint() = *m_pCurCrsr->GetPoint();
-    m_pCrsrStk->GetPtPos() = m_pCurCrsr->GetPtPos();
-
-    SwShellCrsr * pTmp = nullptr;
-    if( m_pCrsrStk->GetNext() != m_pCrsrStk )
-    {
-        pTmp = dynamic_cast<SwShellCrsr*>(m_pCrsrStk->GetNext());
-    }
-    delete m_pCurCrsr;
-    m_pCurCrsr = m_pCrsrStk;
-    m_pCrsrStk->MoveTo(nullptr); // remove from ring
-    m_pCrsrStk = pTmp;
-    if( !m_pCurCrsr->IsInProtectTable( true ) &&
-        !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+    assert(!m_pCursorStack->HasMark() ||
+            CheckNodesRange(m_pCursorStack->GetMark()->nNode,
+                            m_pCurrentCursor->GetPoint()->nNode, true));
+    *m_pCursorStack->GetPoint() = *m_pCurrentCursor->GetPoint();
+    m_pCursorStack->GetPtPos() = m_pCurrentCursor->GetPtPos();
+
+    SwShellCursor * pTmp = nullptr;
+    if( m_pCursorStack->GetNext() != m_pCursorStack )
+    {
+        pTmp = dynamic_cast<SwShellCursor*>(m_pCursorStack->GetNext());
+    }
+    delete m_pCurrentCursor;
+    m_pCurrentCursor = m_pCursorStack;
+    m_pCursorStack->MoveTo(nullptr); // remove from ring
+    m_pCursorStack = pTmp;
+    if( !m_pCurrentCursor->IsInProtectTable( true ) &&
+        !m_pCurrentCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                              nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
     {
-        UpdateCrsr(); // update current cursor
+        UpdateCursor(); // update current cursor
     }
 }
 
-void SwCrsrShell::HideCrsrs()
+void SwCursorShell::HideCursors()
 {
-    if( !m_bHasFocus || m_bBasicHideCrsr )
+    if( !m_bHasFocus || m_bBasicHideCursor )
         return;
 
     // if cursor is visible then hide SV cursor
-    if( m_pVisCrsr->IsVisible() )
+    if( m_pVisibleCursor->IsVisible() )
     {
         SET_CURR_SHELL( this );
-        m_pVisCrsr->Hide();
+        m_pVisibleCursor->Hide();
     }
     // revoke inversion of SSelection
-    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
-    pAktCrsr->Hide();
+    SwShellCursor* pAktCursor = m_pTableCursor ? m_pTableCursor : m_pCurrentCursor;
+    pAktCursor->Hide();
 }
 
-void SwCrsrShell::ShowCrsrs( bool bCrsrVis )
+void SwCursorShell::ShowCursors( bool bCursorVis )
 {
-    if( !m_bHasFocus || m_bAllProtect || m_bBasicHideCrsr )
+    if( !m_bHasFocus || m_bAllProtect || m_bBasicHideCursor )
         return;
 
     SET_CURR_SHELL( this );
-    SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
-    pAktCrsr->Show();
+    SwShellCursor* pAktCursor = m_pTableCursor ? m_pTableCursor : m_pCurrentCursor;
+    pAktCursor->Show();
 
-    if( m_bSVCrsrVis && bCrsrVis ) // also show SV cursor again
-        m_pVisCrsr->Show();
+    if( m_bSVCursorVis && bCursorVis ) // also show SV cursor again
+        m_pVisibleCursor->Show();
 }
 
-void SwCrsrShell::ShowCrsr()
+void SwCursorShell::ShowCursor()
 {
-    if( !m_bBasicHideCrsr )
+    if( !m_bBasicHideCursor )
     {
-        m_bSVCrsrVis = true;
-        m_pCurCrsr->SetShowTextInputFieldOverlay( true );
+        m_bSVCursorVis = true;
+        m_pCurrentCursor->SetShowTextInputFieldOverlay( true );
 
         if (comphelper::LibreOfficeKit::isActive())
         {
@@ -2148,19 +2148,19 @@ void SwCrsrShell::ShowCrsr()
                 libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
         }
 
-        UpdateCrsr();
+        UpdateCursor();
     }
 }
 
-void SwCrsrShell::HideCrsr()
+void SwCursorShell::HideCursor()
 {
-    if( !m_bBasicHideCrsr )
+    if( !m_bBasicHideCursor )
     {
-        m_bSVCrsrVis = false;
+        m_bSVCursorVis = false;
         // possibly reverse selected areas!!
         SET_CURR_SHELL( this );
-        m_pCurCrsr->SetShowTextInputFieldOverlay( false );
-        m_pVisCrsr->Hide();
+        m_pCurrentCursor->SetShowTextInputFieldOverlay( false );
+        m_pVisibleCursor->Hide();
 
         if (comphelper::LibreOfficeKit::isActive())
         {
@@ -2172,45 +2172,45 @@ void SwCrsrShell::HideCrsr()
     }
 }
 
-void SwCrsrShell::ShLooseFcs()
+void SwCursorShell::ShLooseFcs()
 {
-    if( !m_bBasicHideCrsr )
-        HideCrsrs();
+    if( !m_bBasicHideCursor )
+        HideCursors();
     m_bHasFocus = false;
 }
 
-void SwCrsrShell::ShGetFcs( bool bUpdate )
+void SwCursorShell::ShGetFcs( bool bUpdate )
 {
     m_bHasFocus = true;
-    if( !m_bBasicHideCrsr && VisArea().Width() )
+    if( !m_bBasicHideCursor && VisArea().Width() )
     {
-        UpdateCrsr( static_cast<sal_uInt16>( bUpdate ?
-                    SwCrsrShell::CHKRANGE|SwCrsrShell::SCROLLWIN
-                    : SwCrsrShell::CHKRANGE ) );
-        ShowCrsrs( m_bSVCrsrVis );
+        UpdateCursor( static_cast<sal_uInt16>( bUpdate ?
+                    SwCursorShell::CHKRANGE|SwCursorShell::SCROLLWIN
+                    : SwCursorShell::CHKRANGE ) );
+        ShowCursors( m_bSVCursorVis );
     }
 }
 
 /** Get current frame in which the cursor is positioned. */
-SwContentFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
+SwContentFrame *SwCursorShell::GetCurrFrame( const bool bCalcFrame ) const
 {
-    SET_CURR_SHELL( static_cast<SwViewShell*>(const_cast<SwCrsrShell *>(this)) );
-    SwContentFrm *pRet = nullptr;
-    SwContentNode *pNd = m_pCurCrsr->GetContentNode();
+    SET_CURR_SHELL( static_cast<SwViewShell*>(const_cast<SwCursorShell *>(this)) );
+    SwContentFrame *pRet = nullptr;
+    SwContentNode *pNd = m_pCurrentCursor->GetContentNode();
     if ( pNd )
     {
-        if ( bCalcFrm )
+        if ( bCalcFrame )
         {
             sal_uInt16* pST = const_cast<sal_uInt16*>(&mnStartAction);
             ++(*pST);
             const Size aOldSz( GetDocSize() );
-            pRet = pNd->getLayoutFrm( GetLayout(), &m_pCurCrsr->GetPtPos(), m_pCurCrsr->GetPoint() );
+            pRet = pNd->getLayoutFrame( GetLayout(), &m_pCurrentCursor->GetPtPos(), m_pCurrentCursor->GetPoint() );
             --(*pST);
             if( aOldSz != GetDocSize() )
-                const_cast<SwCrsrShell*>(this)->SizeChgNotify();
+                const_cast<SwCursorShell*>(this)->SizeChgNotify();
         }
         else
-            pRet = pNd->getLayoutFrm( GetLayout(), &m_pCurCrsr->GetPtPos(), m_pCurCrsr->GetPoint(), false);
+            pRet = pNd->getLayoutFrame( GetLayout(), &m_pCurrentCursor->GetPtPos(), m_pCurrentCursor->GetPoint(), false);
     }
     return pRet;
 }
@@ -2221,7 +2221,7 @@ SwContentFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
     @param pOld ???
     @param pNew ???
 */
-void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwCursorShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 {
     const sal_uInt16 nWhich = pOld ?
                           pOld->Which() :
@@ -2248,13 +2248,13 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
 
     This means checking if GetMark is set and if SPoint and GetMark differ.
 */
-bool SwCrsrShell::HasSelection() const
+bool SwCursorShell::HasSelection() const
 {
-    const SwPaM* pCrsr = getShellCrsr( true );
-    return IsTableMode() || ( pCrsr->HasMark() && *pCrsr->GetPoint() != *pCrsr->GetMark() );
+    const SwPaM* pCursor = getShellCursor( true );
+    return IsTableMode() || ( pCursor->HasMark() && *pCursor->GetPoint() != *pCursor->GetMark() );
 }
 
-void SwCrsrShell::CallChgLnk()
+void SwCursorShell::CallChgLnk()
 {
     // Do not make any call in start/end action but just remember the change.
     // This will be taken care of in the end action.
@@ -2269,34 +2269,34 @@ void SwCrsrShell::CallChgLnk()
 }
 
 /// get selected text of a node at current cursor
-OUString SwCrsrShell::GetSelText() const
+OUString SwCursorShell::GetSelText() const
 {
     OUString aText;
-    if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
-        m_pCurCrsr->GetMark()->nNode.GetIndex() )
+    if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
+        m_pCurrentCursor->GetMark()->nNode.GetIndex() )
     {
-        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        SwTextNode* pTextNd = m_pCurrentCursor->GetNode().GetTextNode();
         if( pTextNd )
         {
-            const sal_Int32 nStt = m_pCurCrsr->Start()->nContent.GetIndex();
+            const sal_Int32 nStt = m_pCurrentCursor->Start()->nContent.GetIndex();
             aText = pTextNd->GetExpandText( nStt,
-                    m_pCurCrsr->End()->nContent.GetIndex() - nStt );
+                    m_pCurrentCursor->End()->nContent.GetIndex() - nStt );
         }
     }
     return aText;
 }
 
 /// get text only from current cursor position (until end of node)
-OUString SwCrsrShell::GetText() const
+OUString SwCursorShell::GetText() const
 {
     OUString aText;
-    if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
-        m_pCurCrsr->GetMark()->nNode.GetIndex() )
+    if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
+        m_pCurrentCursor->GetMark()->nNode.GetIndex() )
     {
-        SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+        SwTextNode* pTextNd = m_pCurrentCursor->GetNode().GetTextNode();
         if( pTextNd )
             aText = pTextNd->GetText().copy(
-                    m_pCurCrsr->GetPoint()->nContent.GetIndex() );
+                    m_pCurrentCursor->GetPoint()->nContent.GetIndex() );
     }
     return aText;
 }
@@ -2306,13 +2306,13 @@ OUString SwCrsrShell::GetText() const
     @param bEnd    Start counting from the end? From start otherwise.
     @param nOffset position of the character
 */
-sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
+sal_Unicode SwCursorShell::GetChar( bool bEnd, long nOffset )
 {
     if( IsTableMode() ) // not possible in table mode
         return 0;
 
-    const SwPosition* pPos = !m_pCurCrsr->HasMark() ? m_pCurCrsr->GetPoint()
-                                : bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
+    const SwPosition* pPos = !m_pCurrentCursor->HasMark() ? m_pCurrentCursor->GetPoint()
+                                : bEnd ? m_pCurrentCursor->End() : m_pCurrentCursor->Start();
     SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
     if( !pTextNd )
         return 0;
@@ -2332,12 +2332,12 @@ sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
     @param bEnd   Start counting from the end? From start otherwise.
     @param nCount Number of characters.
 */
-bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
+bool SwCursorShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
 {
-    if( !m_pCurCrsr->HasMark() || IsTableMode() )
+    if( !m_pCurrentCursor->HasMark() || IsTableMode() )
         return false; // no selection
 
-    SwPosition* pPos = bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
+    SwPosition* pPos = bEnd ? m_pCurrentCursor->End() : m_pCurrentCursor->Start();
     SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
     OSL_ENSURE( pTextNd, "no text node; how should this then be extended?" );
 
@@ -2354,10 +2354,10 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
     else
         return false; // not possible anymore
 
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
 
     pPos->nContent = nPos;
-    UpdateCrsr();
+    UpdateCursor();
 
     return true;
 }
@@ -2367,16 +2367,16 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
     @param rPt The position to move the visible cursor to.
     @return <false> if SPoint was corrected by the layout.
 */
-bool SwCrsrShell::SetVisCrsr( const Point &rPt )
+bool SwCursorShell::SetVisibleCursor( const Point &rPt )
 {
     SET_CURR_SHELL( this );
     Point aPt( rPt );
-    SwPosition aPos( *m_pCurCrsr->GetPoint() );
-    SwCrsrMoveState aTmpState( MV_SETONLYTEXT );
+    SwPosition aPos( *m_pCurrentCursor->GetPoint() );
+    SwCursorMoveState aTmpState( MV_SETONLYTEXT );
     aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
     aTmpState.m_bRealHeight = true;
 
-    const bool bRet = GetLayout()->GetCrsrOfst( &aPos, aPt /*, &aTmpState*/ );
+    const bool bRet = GetLayout()->GetCursorOfst( &aPos, aPt /*, &aTmpState*/ );
 
     SetInFrontOfLabel( false ); // #i27615#
 
@@ -2391,44 +2391,44 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
                       pSectNd->GetSection().IsProtectFlag())) )
         return false;
 
-    SwContentFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
+    SwContentFrame *pFrame = pTextNd->getLayoutFrame( GetLayout(), &aPt, &aPos );
     if ( Imp()->IsIdleAction() )
-        pFrm->PrepareCrsr();
+        pFrame->PrepareCursor();
     SwRect aTmp( m_aCharRect );
 
-    pFrm->GetCharRect( m_aCharRect, aPos, &aTmpState );
+    pFrame->GetCharRect( m_aCharRect, aPos, &aTmpState );
 
     // #i10137#
-    if( aTmp == m_aCharRect && m_pVisCrsr->IsVisible() )
+    if( aTmp == m_aCharRect && m_pVisibleCursor->IsVisible() )
         return true;
 
-    m_pVisCrsr->Hide(); // always hide visible cursor
+    m_pVisibleCursor->Hide(); // always hide visible cursor
     if( IsScrollMDI( this, m_aCharRect ))
     {
         MakeVisible( m_aCharRect );
-        m_pCurCrsr->Show();
+        m_pCurrentCursor->Show();
     }
 
     {
         if( aTmpState.m_bRealHeight )
-            m_aCrsrHeight = aTmpState.m_aRealHeight;
+            m_aCursorHeight = aTmpState.m_aRealHeight;
         else
         {
-            m_aCrsrHeight.setX(0);
-            m_aCrsrHeight.setY(m_aCharRect.Height());
+            m_aCursorHeight.setX(0);
+            m_aCursorHeight.setY(m_aCharRect.Height());
         }
 
-        m_pVisCrsr->SetDragCrsr();
-        m_pVisCrsr->Show(); // show again
+        m_pVisibleCursor->SetDragCursor();
+        m_pVisibleCursor->Show(); // show again
     }
     return bRet;
 }
 
-bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
+bool SwCursorShell::IsOverReadOnlyPos( const Point& rPt ) const
 {
     Point aPt( rPt );
-    SwPaM aPam( *m_pCurCrsr->GetPoint() );
-    GetLayout()->GetCrsrOfst( aPam.GetPoint(), aPt );
+    SwPaM aPam( *m_pCurrentCursor->GetPoint() );
+    GetLayout()->GetCursorOfst( aPam.GetPoint(), aPt );
     // Formular view
     return aPam.HasReadonlySel( GetViewOptions()->IsFormView() );
 }
@@ -2437,12 +2437,12 @@ bool SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
 
     @param bAll If <false> get only spanned ones (= with selections) (Basic).
 */
-sal_uInt16 SwCrsrShell::GetCrsrCnt( bool bAll ) const
+sal_uInt16 SwCursorShell::GetCursorCnt( bool bAll ) const
 {
-    SwPaM* pTmp = GetCrsr()->GetNext();
-    sal_uInt16 n = (bAll || ( m_pCurCrsr->HasMark() &&
-                    *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark())) ? 1 : 0;
-    while( pTmp != m_pCurCrsr )
+    SwPaM* pTmp = GetCursor()->GetNext();
+    sal_uInt16 n = (bAll || ( m_pCurrentCursor->HasMark() &&
+                    *m_pCurrentCursor->GetPoint() != *m_pCurrentCursor->GetMark())) ? 1 : 0;
+    while( pTmp != m_pCurrentCursor )
     {
         if( bAll || ( static_cast<SwPaM*>(pTmp)->HasMark() &&
                 *static_cast<SwPaM*>(pTmp)->GetPoint() != *static_cast<SwPaM*>(pTmp)->GetMark()))
@@ -2452,54 +2452,54 @@ sal_uInt16 SwCrsrShell::GetCrsrCnt( bool bAll ) const
     return n;
 }
 
-bool SwCrsrShell::IsStartOfDoc() const
+bool SwCursorShell::IsStartOfDoc() const
 {
-    if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
+    if( m_pCurrentCursor->GetPoint()->nContent.GetIndex() )
         return false;
 
     // after EndOfIcons comes the content selection (EndNd+StNd+ContentNd)
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfExtras(), 2 );
     if( !aIdx.GetNode().IsContentNode() )
         GetDoc()->GetNodes().GoNext( &aIdx );
-    return aIdx == m_pCurCrsr->GetPoint()->nNode;
+    return aIdx == m_pCurrentCursor->GetPoint()->nNode;
 }
 
-bool SwCrsrShell::IsEndOfDoc() const
+bool SwCursorShell::IsEndOfDoc() const
 {
     SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
     SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
     if( !pCNd )
         pCNd = SwNodes::GoPrevious( &aIdx );
 
-    return aIdx == m_pCurCrsr->GetPoint()->nNode &&
-            pCNd->Len() == m_pCurCrsr->GetPoint()->nContent.GetIndex();
+    return aIdx == m_pCurrentCursor->GetPoint()->nNode &&
+            pCNd->Len() == m_pCurrentCursor->GetPoint()->nContent.GetIndex();
 }
 
 /** Invalidate cursors
 
     Delete all created cursors, set table crsr and last crsr to their TextNode
-    (or StartNode?). They will then all re-created at the next ::GetCrsr() call.
+    (or StartNode?). They will then all re-created at the next ::GetCursor() call.
 
     This is needed for Drag&Drop/ Clipboard-paste in tables.
 */
-bool SwCrsrShell::ParkTableCrsr()
+bool SwCursorShell::ParkTableCursor()
 {
-    if( !m_pTableCrsr )
+    if( !m_pTableCursor )
         return false;
 
-    m_pTableCrsr->ParkCrsr();
+    m_pTableCursor->ParkCursor();
 
-    while( m_pCurCrsr->GetNext() != m_pCurCrsr )
-        delete m_pCurCrsr->GetNext();
+    while( m_pCurrentCursor->GetNext() != m_pCurrentCursor )
+        delete m_pCurrentCursor->GetNext();
 
     // *always* move cursor's Point and Mark
-    m_pCurCrsr->DeleteMark();
-    *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+    m_pCurrentCursor->DeleteMark();
+    *m_pCurrentCursor->GetPoint() = *m_pTableCursor->GetPoint();
 
     return true;
 }
 
-void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
+void SwCursorShell::_ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing )
 {
     const SwPosition *pStt = pDelRg->Start(),
         *pEnd = pDelRg->GetPoint() == pStt ? pDelRg->GetMark() : pDelRg->GetPoint();
@@ -2534,16 +2534,16 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
             bool bDelete = true;
             if( *ppDelRing == pTmpDel )
             {
-                if( *ppDelRing == m_pCurCrsr )
+                if( *ppDelRing == m_pCurrentCursor )
                 {
-                    if( ( bDelete = GoNextCrsr() ) )
+                    if( ( bDelete = GoNextCursor() ) )
                     {
                         bGoNext = false;
                         pTmp = pTmp->GetNext();
                     }
                 }
                 else
-                    bDelete = false; // never delete the StackCrsr
+                    bDelete = false; // never delete the StackCursor
             }
 
             if( bDelete )
@@ -2571,12 +2571,12 @@ void SwCrsrShell::_ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing )
 
     @param rIdx ???
 */
-void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
+void SwCursorShell::ParkCursor( const SwNodeIndex &rIdx )
 {
     SwNode *pNode = &rIdx.GetNode();
 
     // create a new PaM
-    SwPaM * pNew = new SwPaM( *GetCrsr()->GetPoint() );
+    SwPaM * pNew = new SwPaM( *GetCursor()->GetPoint() );
     if( pNode->GetStartNode() )
     {
         if( ( pNode = pNode->StartOfSectionNode())->IsTableNode() )
@@ -2599,23 +2599,23 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
     // take care of all shells
     for(SwViewShell& rTmp : GetRingContainer())
     {
-        if( dynamic_cast<const SwCrsrShell *>(&rTmp) != nullptr)
+        if( dynamic_cast<const SwCursorShell *>(&rTmp) != nullptr)
         {
-            SwCrsrShell* pSh = static_cast<SwCrsrShell*>(&rTmp);
-            if( pSh->m_pCrsrStk )
-                pSh->_ParkPams( pNew, &pSh->m_pCrsrStk );
+            SwCursorShell* pSh = static_cast<SwCursorShell*>(&rTmp);
+            if( pSh->m_pCursorStack )
+                pSh->_ParkPams( pNew, &pSh->m_pCursorStack );
 
-            pSh->_ParkPams( pNew, &pSh->m_pCurCrsr );
-            if( pSh->m_pTableCrsr )
+            pSh->_ParkPams( pNew, &pSh->m_pCurrentCursor );
+            if( pSh->m_pTableCursor )
             {
                 // set table cursor always to 0 and the current one always to
                 // the beginning of the table
-                SwPaM* pTCrsr = pSh->GetTableCrs();
-                SwNode* pTableNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
+                SwPaM* pTCursor = pSh->GetTableCrs();
+                SwNode* pTableNd = pTCursor->GetPoint()->nNode.GetNode().FindTableNode();
                 if ( pTableNd )
                 {
-                    pTCrsr->DeleteMark();
-                    pSh->m_pCurCrsr->GetPoint()->nNode = *pTableNd;
+                    pTCursor->DeleteMark();
+                    pSh->m_pCurrentCursor->GetPoint()->nNode = *pTableNd;
                 }
             }
         }
@@ -2628,68 +2628,68 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
     Copy cursor position and add it to the ring.
     All views of a document are in the ring of the shell.
 */
-SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
+SwCursorShell::SwCursorShell( SwCursorShell& rShell, vcl::Window *pInitWin )
     : SwViewShell( rShell, pInitWin )
     , SwModify( nullptr )
-    , m_pCrsrStk( nullptr )
-    , m_pBlockCrsr( nullptr )
-    , m_pTableCrsr( nullptr )
+    , m_pCursorStack( nullptr )
+    , m_pBlockCursor( nullptr )
+    , m_pTableCursor( nullptr )
     , m_pBoxIdx( nullptr )
     , m_pBoxPtr( nullptr )
     , m_nUpDownX(0)
-    , m_nLeftFrmPos(0)
+    , m_nLeftFramePos(0)
     , m_nAktNode(0)
     , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
-    , m_nCrsrMove( 0 )
+    , m_nCursorMove( 0 )
     , m_nBasicActionCnt( 0 )
     , m_eMvState( MV_NONE )
     , m_sMarkedListId()
     , m_nMarkedListLevel( 0 )
-    , m_oldColFrm(nullptr)
+    , m_oldColFrame(nullptr)
 {
     SET_CURR_SHELL( this );
     // only keep the position of the current cursor of the copy shell
-    m_pCurCrsr = new SwShellCrsr( *this, *(rShell.m_pCurCrsr->GetPoint()) );
-    m_pCurCrsr->GetContentNode()->Add( this );
+    m_pCurrentCursor = new SwShellCursor( *this, *(rShell.m_pCurrentCursor->GetPoint()) );
+    m_pCurrentCursor->GetContentNode()->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
-    m_bOverwriteCrsr = false;
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCursor =
+    m_bOverwriteCursor = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
-    m_bSVCrsrVis = true;
-    m_bSetCrsrInReadOnly = true;
-    m_pVisCrsr = new SwVisCrsr( this );
+    m_bSVCursorVis = true;
+    m_bSetCursorInReadOnly = true;
+    m_pVisibleCursor = new SwVisibleCursor( this );
     m_bMacroExecAllowed = rShell.IsMacroExecAllowed();
 
 #if defined(IOS)
-    HideCrsr();
+    HideCursor();
 #endif
 }
 
 /// default constructor
-SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
+SwCursorShell::SwCursorShell( SwDoc& rDoc, vcl::Window *pInitWin,
                             const SwViewOption *pInitOpt )
     : SwViewShell( rDoc, pInitWin, pInitOpt )
     , SwModify( nullptr )
-    , m_pCrsrStk( nullptr )
-    , m_pBlockCrsr( nullptr )
-    , m_pTableCrsr( nullptr )
+    , m_pCursorStack( nullptr )
+    , m_pBlockCursor( nullptr )
+    , m_pTableCursor( nullptr )
     , m_pBoxIdx( nullptr )
     , m_pBoxPtr( nullptr )
     , m_nUpDownX(0)
-    , m_nLeftFrmPos(0)
+    , m_nLeftFramePos(0)
     , m_nAktNode(0)
     , m_nAktContent(0)
     , m_nAktNdTyp(0)
     , m_bAktSelection(false)
-    , m_nCrsrMove( 0 )
+    , m_nCursorMove( 0 )
     , m_nBasicActionCnt( 0 )
-    , m_eMvState( MV_NONE ) // state for crsr-travelling - GetCrsrOfst
+    , m_eMvState( MV_NONE ) // state for crsr-travelling - GetCursorOfst
     , m_sMarkedListId()
     , m_nMarkedListLevel( 0 )
-    , m_oldColFrm(nullptr)
+    , m_oldColFrame(nullptr)
 {
     SET_CURR_SHELL( this );
     // create initial cursor and set it to first content position
@@ -2698,50 +2698,50 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
     SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
     SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
 
-    m_pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
+    m_pCurrentCursor = new SwShellCursor( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
 
     // Register shell as dependent at current node. As a result all attribute
     // changes can be forwarded via the Link.
     pCNd->Add( this );
 
     m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
-    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
-    m_bOverwriteCrsr = false;
+    m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCursor =
+    m_bOverwriteCursor = false;
     m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
-    m_bSVCrsrVis = true;
-    m_bSetCrsrInReadOnly = true;
+    m_bSVCursorVis = true;
+    m_bSetCursorInReadOnly = true;
 
-    m_pVisCrsr = new SwVisCrsr( this );
+    m_pVisibleCursor = new SwVisibleCursor( this );
     m_bMacroExecAllowed = true;
 
 #if defined(IOS)
-    HideCrsr();
+    HideCursor();
 #endif
 }
 
-SwCrsrShell::~SwCrsrShell()
+SwCursorShell::~SwCursorShell()
 {
     // if it is not the last view then at least the field should be updated
     if( !unique() )
-        CheckTableBoxContent( m_pCurCrsr->GetPoint() );
+        CheckTableBoxContent( m_pCurrentCursor->GetPoint() );
     else
         ClearTableBoxContent();
 
-    delete m_pVisCrsr;
-    delete m_pBlockCrsr;
-    delete m_pTableCrsr;
+    delete m_pVisibleCursor;
+    delete m_pBlockCursor;
+    delete m_pTableCursor;
 
     // release cursors
-    while(m_pCurCrsr->GetNext() != m_pCurCrsr)
-        delete m_pCurCrsr->GetNext();
-    delete m_pCurCrsr;
+    while(m_pCurrentCursor->GetNext() != m_pCurrentCursor)
+        delete m_pCurrentCursor->GetNext();
+    delete m_pCurrentCursor;
 
     // free stack
-    if( m_pCrsrStk )
+    if( m_pCursorStack )
     {
-        while( m_pCrsrStk->GetNext() != m_pCrsrStk )
-            delete m_pCrsrStk->GetNext();
-        delete m_pCrsrStk;
+        while( m_pCursorStack->GetNext() != m_pCursorStack )
+            delete m_pCursorStack->GetNext();
+        delete m_pCursorStack;
     }
 
     // #i54025# - do not give a HTML parser that might potentially hang as
@@ -2750,55 +2750,55 @@ SwCrsrShell::~SwCrsrShell()
         GetRegisteredInNonConst()->Remove( this );
 }
 
-SwShellCrsr* SwCrsrShell::getShellCrsr( bool bBlock )
+SwShellCursor* SwCursorShell::getShellCursor( bool bBlock )
 {
-    if( m_pTableCrsr )
-        return m_pTableCrsr;
-    if( m_pBlockCrsr && bBlock )
-        return &m_pBlockCrsr->getShellCrsr();
-    return m_pCurCrsr;
+    if( m_pTableCursor )
+        return m_pTableCursor;
+    if( m_pBlockCursor && bBlock )
+        return &m_pBlockCursor->getShellCursor();
+    return m_pCurrentCursor;
 }
 
 /** Should WaitPtr be switched on for the clipboard?
 
     Wait for TableMode, multiple selections and more than x selected paragraphs.
 */
-bool SwCrsrShell::ShouldWait() const
+bool SwCursorShell::ShouldWait() const
 {
-    if ( IsTableMode() || GetCrsrCnt() > 1 )
+    if ( IsTableMode() || GetCursorCnt() > 1 )
         return true;
 
     if( HasDrawView() && GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         return true;
 
-    SwPaM* pPam = GetCrsr();
+    SwPaM* pPam = GetCursor();
     return pPam->Start()->nNode.GetIndex() + 10 <
             pPam->End()->nNode.GetIndex();
 }
 
-size_t SwCrsrShell::UpdateTableSelBoxes()
+size_t SwCursorShell::UpdateTableSelBoxes()
 {
-    if (m_pTableCrsr && (m_pTableCrsr->IsChgd() || !m_pTableCrsr->GetSelectedBoxesCount()))
+    if (m_pTableCursor && (m_pTableCursor->IsChgd() || !m_pTableCursor->GetSelectedBoxesCount()))
     {
-         GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
+         GetLayout()->MakeTableCursors( *m_pTableCursor );
     }
-    return (m_pTableCrsr) ? m_pTableCrsr->GetSelectedBoxesCount() : 0;
+    return (m_pTableCursor) ? m_pTableCursor->GetSelectedBoxesCount() : 0;
 }
 
 /// show the current selected "object"
-void SwCrsrShell::MakeSelVisible()
+void SwCursorShell::MakeSelVisible()
 {
     OSL_ENSURE( m_bHasFocus, "no focus but cursor should be made visible?" );
-    if( m_aCrsrHeight.Y() < m_aCharRect.Height() && m_aCharRect.Height() > VisArea().Height() )
+    if( m_aCursorHeight.Y() < m_aCharRect.Height() && m_aCharRect.Height() > VisArea().Height() )
     {
         SwRect aTmp( m_aCharRect );
         long nDiff = m_aCharRect.Height() - VisArea().Height();
-        if( nDiff < m_aCrsrHeight.getX() )
+        if( nDiff < m_aCursorHeight.getX() )
             aTmp.Top( nDiff + m_aCharRect.Top() );
         else
         {
-            aTmp.Top( m_aCrsrHeight.getX() + m_aCharRect.Top() );
-            aTmp.Height( m_aCrsrHeight.getY() );
+            aTmp.Top( m_aCursorHeight.getX() + m_aCharRect.Top() );
+            aTmp.Height( m_aCursorHeight.getY() );
         }
         if( !aTmp.HasArea() )
         {
@@ -2821,9 +2821,9 @@ void SwCrsrShell::MakeSelVisible()
 }
 
 /// search a valid content position (not protected/hidden)
-bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
+bool SwCursorShell::FindValidContentNode( bool bOnlyText )
 {
-    if( m_pTableCrsr )
+    if( m_pTableCursor )
     {
         OSL_ENSURE( false, "Did not remove table selection!" );
         return false;
@@ -2834,22 +2834,22 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
         GetDoc()->GetDocShell()->IsReadOnlyUI() )
         return true;
 
-    if( m_pCurCrsr->HasMark() )
+    if( m_pCurrentCursor->HasMark() )
         ClearMark();
 
     // first check for frames
-    SwNodeIndex& rNdIdx = m_pCurCrsr->GetPoint()->nNode;
+    SwNodeIndex& rNdIdx = m_pCurrentCursor->GetPoint()->nNode;
     sal_uLong nNdIdx = rNdIdx.GetIndex(); // keep backup
     SwNodes& rNds = mpDoc->GetNodes();
     SwContentNode* pCNd = rNdIdx.GetNode().GetContentNode();
-    const SwContentFrm * pFrm;
+    const SwContentFrame * pFrame;
 
-    if( pCNd && nullptr != (pFrm = pCNd->getLayoutFrm( GetLayout(), nullptr, m_pCurCrsr->GetPoint(), false)) &&
-        !IsReadOnlyAvailable() && pFrm->IsProtected() &&
+    if( pCNd && nullptr != (pFrame = pCNd->getLayoutFrame( GetLayout(), nullptr, m_pCurrentCursor->GetPoint(), false)) &&
+        !IsReadOnlyAvailable() && pFrame->IsProtected() &&
         nNdIdx < rNds.GetEndOfExtras().GetIndex() )
     {
         // skip protected frame
-        SwPaM aPam( *m_pCurCrsr->GetPoint() );
+        SwPaM aPam( *m_pCurrentCursor->GetPoint() );
         aPam.SetMark();
         aPam.GetMark()->nNode = rNds.GetEndOfContent();
         aPam.GetPoint()->nNode = *pCNd->EndOfSectionNode();
@@ -2866,13 +2866,13 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
             rNdIdx = nNdIdx; // back to old node
             return false;
         }
-        *m_pCurCrsr->GetPoint() = *aPam.GetPoint();
+        *m_pCurrentCursor->GetPoint() = *aPam.GetPoint();
     }
     else if( bOnlyText && pCNd && pCNd->IsNoTextNode() )
     {
         // set to beginning of document
         rNdIdx = mpDoc->GetNodes().GetEndOfExtras();
-        m_pCurCrsr->GetPoint()->nContent.Assign( mpDoc->GetNodes().GoNext(
+        m_pCurrentCursor->GetPoint()->nContent.Assign( mpDoc->GetNodes().GoNext(
                                                             &rNdIdx ), 0 );
         nNdIdx = rNdIdx.GetIndex();
     }
@@ -2907,7 +2907,7 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
         // if we're successful, set the new position
         if( ! aPam.GetNode().IsProtect() )
         {
-            *m_pCurCrsr->GetPoint() = *aPam.GetPoint();
+            *m_pCurrentCursor->GetPoint() = *aPam.GetPoint();
         }
     }
 
@@ -2937,9 +2937,9 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
                     if( pCNd->FindTableNode() )
                     {
                         SwCallLink aTmp( *this );
-                        SwCrsrSaveState aSaveState( *m_pCurCrsr );
+                        SwCursorSaveState aSaveState( *m_pCurrentCursor );
                         aTmp.nNdTyp = 0; // don't do anything in DTOR
-                        if( !m_pCurCrsr->IsInProtectTable( true ) )
+                        if( !m_pCurrentCursor->IsInProtectTable( true ) )
                         {
                             const SwSectionNode* pSNd = pCNd->FindSectionNode();
                             if( !pSNd || !pSNd->GetSection().IsHiddenFlag()
@@ -2962,8 +2962,8 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
                 if( bOk && rNdIdx.GetIndex() < rNds.GetEndOfExtras().GetIndex() )
                 {
                     // also check for Fly - might be protected as well
-                    if( nullptr == (pFrm = pCNd->getLayoutFrm( GetLayout(), nullptr, nullptr, false)) ||
-                        ( !IsReadOnlyAvailable() && pFrm->IsProtected() ) ||
+                    if( nullptr == (pFrame = pCNd->getLayoutFrame( GetLayout(), nullptr, nullptr, false)) ||
+                        ( !IsReadOnlyAvailable() && pFrame->IsProtected() ) ||
                         ( bOnlyText && pCNd->IsNoTextNode() ) )
                     {
                         // continue search
@@ -2985,48 +2985,48 @@ bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
     {
         pCNd = rNdIdx.GetNode().GetContentNode();
         const sal_Int32 nContent = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nContent );
+        m_pCurrentCursor->GetPoint()->nContent.Assign( pCNd, nContent );
     }
     else
     {
         pCNd = rNdIdx.GetNode().GetContentNode();
         // if cursor in hidden frame, always move it
-        if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), nullptr, nullptr, false) )
+        if( !pCNd || !pCNd->getLayoutFrame( GetLayout(), nullptr, nullptr, false) )
         {
-            SwCrsrMoveState aTmpState( MV_NONE );
+            SwCursorMoveState aTmpState( MV_NONE );
             aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
-            GetLayout()->GetCrsrOfst( m_pCurCrsr->GetPoint(), m_pCurCrsr->GetPtPos(),
+            GetLayout()->GetCursorOfst( m_pCurrentCursor->GetPoint(), m_pCurrentCursor->GetPtPos(),
                                         &aTmpState );
         }
     }
     return bOk;
 }
 
-bool SwCrsrShell::IsCrsrReadonly() const
+bool SwCursorShell::IsCursorReadonly() const
 {
     if ( GetViewOptions()->IsReadonly() ||
          GetViewOptions()->IsFormView() /* Formula view */ )
     {
-        SwFrm *pFrm = GetCurrFrm( false );
-        const SwFlyFrm* pFly;
+        SwFrame *pFrame = GetCurrFrame( false );
+        const SwFlyFrame* pFly;
         const SwSection* pSection;
 
-        if( pFrm && pFrm->IsInFly() &&
-            (pFly = pFrm->FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
+        if( pFrame && pFrame->IsInFly() &&
+            (pFly = pFrame->FindFlyFrame())->GetFormat()->GetEditInReadonly().GetValue() &&
             pFly->Lower() &&
-            !pFly->Lower()->IsNoTextFrm() &&
+            !pFly->Lower()->IsNoTextFrame() &&
             !GetDrawView()->GetMarkedObjectList().GetMarkCount() )
         {
             return false;
         }
         // edit in readonly sections
-        else if ( pFrm && pFrm->IsInSct() &&
-            nullptr != ( pSection = pFrm->FindSctFrm()->GetSection() ) &&
+        else if ( pFrame && pFrame->IsInSct() &&
+            nullptr != ( pSection = pFrame->FindSctFrame()->GetSection() ) &&
             pSection->IsEditInReadonlyFlag() )
         {
             return false;
         }
-        else if ( !IsMultiSelection() && CrsrInsideInputField() )
+        else if ( !IsMultiSelection() && CursorInsideInputField() )
         {
             return false;
         }
@@ -3037,12 +3037,12 @@ bool SwCrsrShell::IsCrsrReadonly() const
 }
 
 /// is the cursor allowed to enter ReadOnly sections?
-void SwCrsrShell::SetReadOnlyAvailable( bool bFlag )
+void SwCursorShell::SetReadOnlyAvailable( bool bFlag )
 {
     // *never* switch in GlobalDoc
     if( (!GetDoc()->GetDocShell() ||
          dynamic_cast<const SwGlobalDocShell*>(GetDoc()->GetDocShell()) == nullptr ) &&
-        bFlag != m_bSetCrsrInReadOnly )
+        bFlag != m_bSetCursorInReadOnly )
     {
         // If the flag is switched off then all selections need to be
         // invalidated. Otherwise we would trust that nothing protected is selected.
@@ -3050,27 +3050,27 @@ void SwCrsrShell::SetReadOnlyAvailable( bool bFlag )
         {
             ClearMark();
         }
-        m_bSetCrsrInReadOnly = bFlag;
-        UpdateCrsr();
+        m_bSetCursorInReadOnly = bFlag;
+        UpdateCursor();
     }
 }
 
-bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
+bool SwCursorShell::HasReadonlySel(bool bAnnotationMode) const
 {
     bool bRet = false;
     // If protected area is to be ignored, then selections are never read-only.
     if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView()) && !GetViewOptions()->IsIgnoreProtectedArea())
     {
-        if ( m_pTableCrsr != nullptr )
+        if ( m_pTableCursor != nullptr )
         {
-            bRet = m_pTableCrsr->HasReadOnlyBoxSel()
-                   || m_pTableCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
+            bRet = m_pTableCursor->HasReadOnlyBoxSel()
+                   || m_pTableCursor->HasReadonlySel( GetViewOptions()->IsFormView() );
         }
         else
         {
-            for(const SwPaM& rCrsr : m_pCurCrsr->GetRingContainer())
+            for(const SwPaM& rCursor : m_pCurrentCursor->GetRingContainer())
             {
-                if( rCrsr.HasReadonlySel( GetViewOptions()->IsFormView(), bAnnotationMode ) )
+                if( rCursor.HasReadonlySel( GetViewOptions()->IsFormView(), bAnnotationMode ) )
                 {
                     bRet = true;
                     break;
@@ -3081,49 +3081,49 @@ bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
     return bRet;
 }
 
-bool SwCrsrShell::IsSelFullPara() const
+bool SwCursorShell::IsSelFullPara() const
 {
     bool bRet = false;
 
-    if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
-        m_pCurCrsr->GetMark()->nNode.GetIndex() && !m_pCurCrsr->IsMultiSelection() )
+    if( m_pCurrentCursor->GetPoint()->nNode.GetIndex() ==
+        m_pCurrentCursor->GetMark()->nNode.GetIndex() && !m_pCurrentCursor->IsMultiSelection() )
     {
-        sal_Int32 nStt = m_pCurCrsr->GetPoint()->nContent.GetIndex();
-        sal_Int32 nEnd = m_pCurCrsr->GetMark()->nContent.GetIndex();
+        sal_Int32 nStt = m_pCurrentCursor->GetPoint()->nContent.GetIndex();
+        sal_Int32 nEnd = m_pCurrentCursor->GetMark()->nContent.GetIndex();
         if( nStt > nEnd )
         {
             sal_Int32 nTmp = nStt;
             nStt = nEnd;
             nEnd = nTmp;
         }
-        const SwContentNode* pCNd = m_pCurCrsr->GetContentNode();
+        const SwContentNode* pCNd = m_pCurrentCursor->GetContentNode();
         bRet = pCNd && !nStt && nEnd == pCNd->Len();
     }
     return bRet;
 }
 
-short SwCrsrShell::GetTextDirection( const Point* pPt ) const
+short SwCursorShell::GetTextDirection( const Point* pPt ) const
 {
-    SwPosition aPos( *m_pCurCrsr->GetPoint() );
-    Point aPt( pPt ? *pPt : m_pCurCrsr->GetPtPos() );
+    SwPosition aPos( *m_pCurrentCursor->GetPoint() );
+    Point aPt( pPt ? *pPt : m_pCurrentCursor->GetPtPos() );
     if( pPt )
     {
-        SwCrsrMoveState aTmpState( MV_NONE );
+        SwCursorMoveState aTmpState( MV_NONE );
         aTmpState.m_bSetInReadOnly = IsReadOnlyAvailable();
 
-        GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
+        GetLayout()->GetCursorOfst( &aPos, aPt, &aTmpState );
     }
 
     return mpDoc->GetTextDirection( aPos, &aPt );
 }
 
-bool SwCrsrShell::IsInVerticalText( const Point* pPt ) const
+bool SwCursorShell::IsInVerticalText( const Point* pPt ) const
 {
     const short nDir = GetTextDirection( pPt );
     return FRMDIR_VERT_TOP_RIGHT == nDir || FRMDIR_VERT_TOP_LEFT == nDir;
 }
 
-bool SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const
+bool SwCursorShell::IsInRightToLeftText( const Point* pPt ) const
 {
     const short nDir = GetTextDirection( pPt );
     // GetTextDirection uses FRMDIR_VERT_TOP_LEFT to indicate RTL in
@@ -3133,12 +3133,12 @@ bool SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const
 
 /// If the current cursor position is inside a hidden range, the hidden range
 /// is selected.
-bool SwCrsrShell::SelectHiddenRange()
+bool SwCursorShell::SelectHiddenRange()
 {
     bool bRet = false;
-    if ( !GetViewOptions()->IsShowHiddenChar() && !m_pCurCrsr->HasMark() )
+    if ( !GetViewOptions()->IsShowHiddenChar() && !m_pCurrentCursor->HasMark() )
     {
-        SwPosition& rPt = *m_pCurCrsr->GetPoint();
+        SwPosition& rPt = *m_pCurrentCursor->GetPoint();
         const SwTextNode* pNode = rPt.nNode.GetNode().GetTextNode();
         if ( pNode )
         {
@@ -3151,8 +3151,8 @@ bool SwCrsrShell::SelectHiddenRange()
             if ( COMPLETE_STRING != nHiddenStart )
             {
                 // make selection:
-                m_pCurCrsr->SetMark();
-                m_pCurCrsr->GetMark()->nContent = nHiddenEnd;
+                m_pCurrentCursor->SetMark();
+                m_pCurrentCursor->GetMark()->nContent = nHiddenEnd;
                 bRet = true;
             }
         }
@@ -3161,42 +3161,42 @@ bool SwCrsrShell::SelectHiddenRange()
     return bRet;
 }
 
-sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
+sal_uLong SwCursorShell::Find( const SearchOptions& rSearchOpt,
                              bool bSearchInNotes,
                              SwDocPositions eStart, SwDocPositions eEnd,
                              bool& bCancel,
                              FindRanges eRng,
                              bool bReplace )
 {
-    if( m_pTableCrsr )
-        GetCrsr();
-    delete m_pTableCrsr, m_pTableCrsr = nullptr;
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_uLong nRet = m_pCurCrsr->Find( rSearchOpt, bSearchInNotes, eStart, eEnd,
+    if( m_pTableCursor )
+        GetCursor();
+    delete m_pTableCursor, m_pTableCursor = nullptr;
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    sal_uLong nRet = m_pCurrentCursor->Find( rSearchOpt, bSearchInNotes, eStart, eEnd,
                                      bCancel, eRng, bReplace );
     if( nRet || bCancel )
-        UpdateCrsr();
+        UpdateCursor();
     return nRet;
 }
 
-sal_uLong SwCrsrShell::Find( const SwTextFormatColl& rFormatColl,
+sal_uLong SwCursorShell::Find( const SwTextFormatColl& rFormatColl,
                              SwDocPositions eStart, SwDocPositions eEnd,
                              bool& bCancel,
                              FindRanges eRng,
                              const SwTextFormatColl* pReplFormat )
 {
-    if( m_pTableCrsr )
-        GetCrsr();
-    delete m_pTableCrsr, m_pTableCrsr = nullptr;
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_uLong nRet = m_pCurCrsr->Find( rFormatColl, eStart, eEnd, bCancel, eRng,
+    if( m_pTableCursor )
+        GetCursor();
+    delete m_pTableCursor, m_pTableCursor = nullptr;
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    sal_uLong nRet = m_pCurrentCursor->Find( rFormatColl, eStart, eEnd, bCancel, eRng,
                                      pReplFormat );
     if( nRet )
-        UpdateCrsr();
+        UpdateCursor();
     return nRet;
 }
 
-sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
+sal_uLong SwCursorShell::Find( const SfxItemSet& rSet,
                              bool bNoCollections,
                              SwDocPositions eStart, SwDocPositions eEnd,
                              bool& bCancel,
@@ -3204,40 +3204,40 @@ sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
                              const SearchOptions* pSearchOpt,
                              const SfxItemSet* rReplSet )
 {
-    if( m_pTableCrsr )
-        GetCrsr();
-    delete m_pTableCrsr, m_pTableCrsr = nullptr;
-    SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
-    sal_uLong nRet = m_pCurCrsr->Find( rSet, bNoCollections, eStart, eEnd,
+    if( m_pTableCursor )
+        GetCursor();
+    delete m_pTableCursor, m_pTableCursor = nullptr;
+    SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
+    sal_uLong nRet = m_pCurrentCursor->Find( rSet, bNoCollections, eStart, eEnd,
                                      bCancel, eRng, pSearchOpt, rReplSet );
     if( nRet )
-        UpdateCrsr();
+        UpdateCursor();
     return nRet;
 }
 
-void SwCrsrShell::SetSelection( const SwPaM& rCrsr )
+void SwCursorShell::SetSelection( const SwPaM& rCursor )
 {
     StartAction();
-    SwPaM* pCrsr = GetCrsr();
-    *pCrsr->GetPoint() = *rCrsr.GetPoint();
-    if(rCrsr.HasMark())
+    SwPaM* pCursor = GetCursor();
+    *pCursor->GetPoint() = *rCursor.GetPoint();
+    if(rCursor.HasMark())
     {
-        pCrsr->SetMark();
-        *pCrsr->GetMark() = *rCrsr.GetMark();
+        pCursor->SetMark();
+        *pCursor->GetMark() = *rCursor.GetMark();
     }
-    if(rCrsr.GetNext() != &rCrsr)
+    if(rCursor.GetNext() != &rCursor)
     {
-        const SwPaM *_pStartCrsr = rCrsr.GetNext();
+        const SwPaM *_pStartCursor = rCursor.GetNext();
         do
         {
-            SwPaM* pCurrentCrsr = CreateCrsr();
-            *pCurrentCrsr->GetPoint() = *_pStartCrsr->GetPoint();
-            if(_pStartCrsr->HasMark())
+            SwPaM* pCurrentCursor = CreateCursor();
+            *pCurrentCursor->GetPoint() = *_pStartCursor->GetPoint();
+            if(_pStartCursor->HasMark())
             {
-                pCurrentCrsr->SetMark();
-                *pCurrentCrsr->GetMark() = *_pStartCrsr->GetMark();
+                pCurrentCursor->SetMark();
+                *pCurrentCursor->GetMark() = *_pStartCursor->GetMark();
             }
-        } while( (_pStartCrsr = _pStartCrsr->GetNext()) != &rCrsr );
+        } while( (_pStartCursor = _pStartCursor->GetNext()) != &rCursor );
     }
     EndAction();
 }
@@ -3271,44 +3271,44 @@ bool sw_PosOk(const SwPosition & aPos)
 
    @param aPam the PaM to check
 */
-static bool lcl_CrsrOk(SwPaM & aPam)
+static bool lcl_CursorOk(SwPaM & aPam)
 {
     return sw_PosOk(*aPam.GetPoint()) && (! aPam.HasMark()
         || sw_PosOk(*aPam.GetMark()));
 }
 
-void SwCrsrShell::ClearUpCrsrs()
+void SwCursorShell::ClearUpCursors()
 {
     // start of the ring
-    SwPaM * pStartCrsr = GetCrsr();
+    SwPaM * pStartCursor = GetCursor();
     // start loop with second entry of the ring
-    SwPaM * pCrsr = pStartCrsr->GetNext();
-    SwPaM * pTmpCrsr;
+    SwPaM * pCursor = pStartCursor->GetNext();
+    SwPaM * pTmpCursor;
     bool bChanged = false;
 
     // For all entries in the ring except the start entry delete the entry if
     // it is invalid.
-    while (pCrsr != pStartCrsr)
+    while (pCursor != pStartCursor)
     {
-        pTmpCrsr = pCrsr->GetNext();
-        if ( ! lcl_CrsrOk(*pCrsr))
+        pTmpCursor = pCursor->GetNext();
+        if ( ! lcl_CursorOk(*pCursor))
         {
-            delete pCrsr;
+            delete pCursor;
             bChanged = true;
         }
-        pCrsr = pTmpCrsr;
+        pCursor = pTmpCursor;
     }
 
-    if( pStartCrsr->HasMark() && !sw_PosOk( *pStartCrsr->GetMark() ) )
+    if( pStartCursor->HasMark() && !sw_PosOk( *pStartCursor->GetMark() ) )
     {
-        pStartCrsr->DeleteMark();
+        pStartCursor->DeleteMark();
         bChanged = true;
     }
-    if( !sw_PosOk( *pStartCrsr->GetPoint() ) )
+    if( !sw_PosOk( *pStartCursor->GetPoint() ) )
     {
         SwNodes & aNodes = GetDoc()->GetNodes();
-        const SwNode* pStart = lcl_NodeContext( pStartCrsr->GetPoint()->nNode.GetNode() );
-        SwNodeIndex aIdx( pStartCrsr->GetPoint()->nNode );
+        const SwNode* pStart = lcl_NodeContext( pStartCursor->GetPoint()->nNode.GetNode() );
+        SwNodeIndex aIdx( pStartCursor->GetPoint()->nNode );
         SwNode * pNode = SwNodes::GoPrevious(&aIdx);
         if( pNode == nullptr || lcl_NodeContext( *pNode ) != pStart )
             aNodes.GoNext( &aIdx );
@@ -3327,7 +3327,7 @@ void SwCrsrShell::ClearUpCrsrs()
         if (bFound)
         {
             SwPaM aTmpPam(*pNode);
-            *pStartCrsr = aTmpPam;
+            *pStartCursor = aTmpPam;
         }
 
         bChanged = true;
@@ -3335,30 +3335,30 @@ void SwCrsrShell::ClearUpCrsrs()
 
     // If at least one of the cursors in the ring have been deleted or replaced,
     // remove the table cursor.
-    if (m_pTableCrsr != nullptr && bChanged)
-        TableCrsrToCursor();
+    if (m_pTableCursor != nullptr && bChanged)
+        TableCursorToCursor();
 }
 
-OUString SwCrsrShell::GetCrsrDescr() const
+OUString SwCursorShell::GetCursorDescr() const
 {
     OUString aResult;
 
     if (IsMultiSelection())
         aResult += SW_RES(STR_MULTISEL);
     else
-        aResult = SwDoc::GetPaMDescr(*GetCrsr());
+        aResult = SwDoc::GetPaMDescr(*GetCursor());
 
     return aResult;
 }
 
-void SwCrsrShell::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwCursorShell::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
-    xmlTextWriterStartElement(pWriter, BAD_CAST("swCrsrShell"));
+    xmlTextWriterStartElement(pWriter, BAD_CAST("swCursorShell"));
 
     SwViewShell::dumpAsXml(pWriter);
 
-    xmlTextWriterStartElement(pWriter, BAD_CAST("m_pCurCrsr"));
-    for (SwPaM& rPaM : m_pCurCrsr->GetRingContainer())
+    xmlTextWriterStartElement(pWriter, BAD_CAST("m_pCurrentCursor"));
+    for (SwPaM& rPaM : m_pCurrentCursor->GetRingContainer())
         rPaM.dumpAsXml(pWriter);
     xmlTextWriterEndElement(pWriter);
 
@@ -3423,15 +3423,15 @@ static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
     rRange = xRange;
 }
 
-void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
+void SwCursorShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
                                    uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
                                    uno::Reference< text::XTextRange>& rRange ) const
 {
     if ( !SwSmartTagMgr::Get().IsSmartTagsEnabled() )
         return;
 
-    SwPaM* pCrsr = GetCrsr();
-    SwPosition aPos( *pCrsr->GetPoint() );
+    SwPaM* pCursor = GetCursor();
+    SwPosition aPos( *pCursor->GetPoint() );
     SwTextNode *pNode = aPos.nNode.GetNode().GetTextNode();
     if ( pNode && !pNode->IsInProtectSect() )
     {
@@ -3460,7 +3460,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
 }
 
 // see also SwEditShell::GetCorrection( const Point* pPt, SwRect& rSelectRect )
-void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
+void SwCursorShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
                                    uno::Sequence< OUString >& rSmartTagTypes,
                                    uno::Sequence< uno::Reference< container::XStringKeyMap > >& rStringKeyMaps,
                                    uno::Reference<text::XTextRange>& rRange )
@@ -3468,16 +3468,16 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
     if ( !SwSmartTagMgr::Get().IsSmartTagsEnabled() )
         return;
 
-    SwPaM* pCrsr = GetCrsr();
-    SwPosition aPos( *pCrsr->GetPoint() );
+    SwPaM* pCursor = GetCursor();
+    SwPosition aPos( *pCursor->GetPoint() );
     Point aPt( rPt );
-    SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
+    SwCursorMoveState eTmpState( MV_SETONLYTEXT );
     SwSpecialPos aSpecialPos;
     eTmpState.m_pSpecialPos = &aSpecialPos;
     SwTextNode *pNode;
     const SwWrongList *pSmartTagList;
 
-    if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
+    if( GetLayout()->GetCursorOfst( &aPos, aPt, &eTmpState ) &&
         nullptr != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
         nullptr != (pSmartTagList = pNode->GetSmartTags()) &&
         !pNode->IsInProtectSect() )
@@ -3505,9 +3505,9 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             //save the start and end positions of the line and the starting point
             Push();
             LeftMargin();
-            const sal_Int32 nLineStart = GetCrsr()->GetPoint()->nContent.GetIndex();
+            const sal_Int32 nLineStart = GetCursor()->GetPoint()->nContent.GetIndex();
             RightMargin();
-            const sal_Int32 nLineEnd = GetCrsr()->GetPoint()->nContent.GetIndex();
+            const sal_Int32 nLineEnd = GetCursor()->GetPoint()->nContent.GetIndex();
             Pop(false);
 
             // make sure the selection build later from the data below does not
@@ -3524,9 +3524,9 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
                 ++nRight;
 
             aPos.nContent = nBegin + nLeft;
-            pCrsr = GetCrsr();
-            *pCrsr->GetPoint() = aPos;
-            pCrsr->SetMark();
+            pCursor = GetCursor();
+            *pCursor->GetPoint() = aPos;
+            pCursor->SetMark();
             ExtendSelection( true, nLen - nLeft - nRight );
             // do not determine the rectangle in the current line
             const sal_Int32 nWordStart = (nBegin + nLeft) < nLineStart ? nLineStart : nBegin + nLeft;
@@ -3534,19 +3534,19 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
             // be calculated
             const sal_Int32 nWordEnd = (nBegin + nLen - nLeft - nRight) > nLineEnd ? nLineEnd : (nBegin + nLen - nLeft - nRight);
             Push();
-            pCrsr->DeleteMark();
-            SwIndex& rContent = GetCrsr()->GetPoint()->nContent;
+            pCursor->DeleteMark();
+            SwIndex& rContent = GetCursor()->GetPoint()->nContent;
             rContent = nWordStart;
             SwRect aStartRect;
-            SwCrsrMoveState aState;
+            SwCursorMoveState aState;
             aState.m_bRealWidth = true;
-            SwContentNode* pContentNode = pCrsr->GetContentNode();
-            SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
+            SwContentNode* pContentNode = pCursor->GetContentNode();
+            SwContentFrame *pContentFrame = pContentNode->getLayoutFrame( GetLayout(), &rPt, pCursor->GetPoint(), false);
 
-            pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+            pContentFrame->GetCharRect( aStartRect, *pCursor->GetPoint(), &aState );
             rContent = nWordEnd - 1;
             SwRect aEndRect;
-            pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+            pContentFrame->GetCharRect( aEndRect, *pCursor->GetPoint(),&aState );
             rSelectRect = aStartRect.Union( aEndRect );
             Pop(false);
         }
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a7f1d341cd93..f9ce84c17371 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -71,123 +71,123 @@
 
 using namespace ::com::sun::star;
 
-void SwCrsrShell::MoveCrsrToNum()
+void SwCursorShell::MoveCursorToNum()
 {
-    SwCallLink aLk( *this ); // watch Crsr-Moves
-    SwCrsrSaveState aSaveState( *m_pCurCrsr );
+    SwCallLink aLk( *this ); // watch Cursor-Moves
+    SwCursorSaveState aSaveState( *m_pCurrentCursor );
     if( ActionPend() )
         return;
     SET_CURR_SHELL( this );
     // try to set cursor onto this position, at half of the char-
     // SRectangle's height
-    Point aPt( m_pCurCrsr->GetPtPos() );
-    SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->getLayoutFrm( GetLayout(), &aPt,
-                                                m_pCurCrsr->GetPoint() );
-    pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
-    pFrm->Calc(GetOut());
-    if( pFrm->IsVertical() )
+    Point aPt( m_pCurrentCursor->GetPtPos() );
+    SwContentFrame * pFrame = m_pCurrentCursor->GetContentNode()->getLayoutFrame( GetLayout(), &aPt,
+                                                m_pCurrentCursor->GetPoint() );
+    pFrame->GetCharRect( m_aCharRect, *m_pCurrentCursor->GetPoint() );
+    pFrame->Calc(GetOut());
+    if( pFrame->IsVertical() )
     {
         aPt.setX(m_aCharRect.Center().getX());
-        aPt.setY(pFrm->Frm().Top() + GetUpDownX());
+        aPt.setY(pFrame->Frame().Top() + GetUpDownX());
     }
     else
     {
         aPt.setY(m_aCharRect.Center().getY());
-        aPt.setX(pFrm->Frm().Left() + GetUpDownX());
+        aPt.setX(pFrame->Frame().Left() + GetUpDownX());
     }
-    pFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
-    if ( !m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+    pFrame->GetCursorOfst( m_pCurrentCursor->GetPoint(), aPt );
+    if ( !m_pCurrentCursor->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
                                 nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ))
     {
-        UpdateCrsr(SwCrsrShell::UPDOWN |
-                SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                SwCrsrShell::READONLY );
+        UpdateCursor(SwCursorShell::UPDOWN |
+                SwCursorShell::SCROLLWIN | SwCursorShell::CHKRANGE |
+                SwCursorShell::READONLY );
     }
 }
 
 /// go to next/previous point on the same level
-bool SwCrsrShell::GotoNextNum()
+bool SwCursorShell::GotoNextNum()
 {
-    if (!SwDoc::GotoNextNum( *m_pCurCrsr->GetPoint() ))
+    if (!SwDoc::GotoNextNum( *m_pCurrentCursor->GetPoint() ))
         return false;
-    MoveCrsrToNum();
+    MoveCursorToNum();
     return true;
 }
 
-bool SwCrsrShell::GotoPrevNum()
+bool SwCursorShell::GotoPrevNum()
 {
-    if (!SwDoc::GotoPrevNum( *m_pCurCrsr->GetPoint() ))
+    if (!SwDoc::GotoPrevNum( *m_pCurrentCursor->GetPoint() ))
         return false;
-    MoveCrsrToNum();
+    MoveCursorToNum();
     return true;
 }
 
 /// jump from content to header
-bool SwCrsrShell::GotoHeaderText()
+bool SwCursorShell::GotoHeaderText()
 {
-    const SwFrm* pFrm = GetCurrFrm()->FindPageFrm();
-    while( pFrm && !pFrm->IsHeaderFrm() )
-        pFrm = pFrm->GetLower();
+    const SwFrame* pFrame = GetCurrFrame()->FindPageFrame();
+    while( pFrame && !pFrame->IsHeaderFrame() )
+        pFrame = pFrame->GetLower();
     // found header, search 1. content frame
-    while( pFrm && !pFrm->IsContentFrm() )
-        pFrm = pFrm->GetLower();
+    while( pFrame && !pFrame->IsContentFrame() )
+        pFrame = pFrame->GetLower();
 
-    if( pFrm )
+    if( pFrame )
     {
         SET_CURR_SHELL( this );
         // get header frame
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCursor *pTmpCrsr = getShellCrsr( true );
-        SwCrsrSaveState aSaveState( *pTmpCrsr );
-        pFrm->Calc(GetOut());
-        Point aPt( pFrm->Frm().Pos() + pFrm->Prt().Pos() );
-        pFrm->GetCrsrOfst( pTmpCrsr->GetPoint(), aPt );
-        if( !pTmpCrsr->IsSelOvr() )
-            UpdateCrsr();
+        SwCallLink aLk( *this ); // watch Cursor-Moves
+        SwCursor *pTmpCursor = getShellCursor( true );
+        SwCursorSaveState aSaveState( *pTmpCursor );
+        pFrame->Calc(GetOut());
+        Point aPt( pFrame->Frame().Pos() + pFrame->Prt().Pos() );
+        pFrame->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
+        if( !pTmpCursor->IsSelOvr() )
+            UpdateCursor();
         else
-            pFrm = nullptr;
+            pFrame = nullptr;
     }
-    return nullptr != pFrm;
+    return nullptr != pFrame;
 }
 
 /// jump from content to footer
-bool SwCrsrShell::GotoFooterText()
+bool SwCursorShell::GotoFooterText()
 {
-    const SwPageFrm* pFrm = GetCurrFrm()->FindPageFrm();
-    if( pFrm )
+    const SwPageFrame* pFrame = GetCurrFrame()->FindPageFrame();
+    if( pFrame )
     {
-        const SwFrm* pLower = pFrm->GetLastLower();
+        const SwFrame* pLower = pFrame->GetLastLower();
 
-        while( pLower && !pLower->IsFooterFrm() )
+        while( pLower && !pLower->IsFooterFrame() )
             pLower = pLower->GetLower();
         // found footer, search 1. content frame
-        while( pLower && !pLower->IsContentFrm() )
+        while( pLower && !pLower->IsContentFrame() )
             pLower = pLower->GetLower();
 
         if( pLower )
         {
-            SwCursor *pTmpCrsr = getShellCrsr( true );
+            SwCursor *pTmpCursor = getShellCursor( true );
             SET_CURR_SHELL( this );
             // get position in footer
-            SwCallLink aLk( *this ); // watch Crsr-Moves
-            SwCrsrSaveState aSaveState( *pTmpCrsr );
+            SwCallLink aLk( *this ); // watch Cursor-Moves
+            SwCursorSaveState aSaveState( *pTmpCursor );
             pLower->Calc(GetOut());
-            Point aPt( pLower->Frm().Pos() + pLower->Prt().Pos() );
-            pLower->GetCrsrOfst( pTmpCrsr->GetPoint(), aPt );
-            if( !pTmpCrsr->IsSelOvr() )
-                UpdateCrsr();
+            Point aPt( pLower->Frame().Pos() + pLower->Prt().Pos() );
+            pLower->GetCursorOfst( pTmpCursor->GetPoint(), aPt );
+            if( !pTmpCursor->IsSelOvr() )
+                UpdateCursor();
             else
-                pFrm = nullptr;
+                pFrame = nullptr;
         }
         else
-            pFrm = nullptr;
+            pFrame = nullptr;
     }
     else
-        pFrm = nullptr;
-    return nullptr != pFrm;
+        pFrame = nullptr;
+    return nullptr != pFrame;
 }
 
-bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
+bool SwCursorShell::SetCursorInHdFt( size_t nDescNo, bool bInHeader )
 {
     bool bRet = false;
     SwDoc *pMyDoc = GetDoc();
@@ -198,7 +198,7 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
     if( SIZE_MAX == nDescNo )
     {
         // take the current one
-        const SwPageFrm* pPage = GetCurrFrm()->FindPageFrm();
+        const SwPageFrame* pPage = GetCurrFrame()->FindPageFrame();
         if( pPage && pMyDoc->ContainsPageDesc(
                 pPage->GetPageDesc(), &nDescNo) )
             pDesc = pPage->GetPageDesc();
@@ -232,24 +232,24 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
             if( !pCNd )
                 pCNd = pMyDoc->GetNodes().GoNext( &aIdx );
 
-            Point aPt( m_pCurCrsr->GetPtPos() );
+            Point aPt( m_pCurrentCursor->GetPtPos() );
 
-            if( pCNd && nullptr != pCNd->getLayoutFrm( GetLayout(), &aPt, nullptr, false ) )
+            if( pCNd && nullptr != pCNd->getLayoutFrame( GetLayout(), &aPt, nullptr, false ) )
             {
                 // then we can set the cursor in here
-                SwCallLink aLk( *this ); // watch Crsr-Moves
-                SwCrsrSaveState aSaveState( *m_pCurCrsr );
+                SwCallLink aLk( *this ); // watch Cursor-Moves
+                SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
                 ClearMark();
 
-                SwPosition& rPos = *m_pCurCrsr->GetPoint();
+                SwPosition& rPos = *m_pCurrentCursor->GetPoint();
                 rPos.nNode = *pCNd;
                 rPos.nContent.Assign( pCNd, 0 );
 
-                bRet = !m_pCurCrsr->IsSelOvr();
+                bRet = !m_pCurrentCursor->IsSelOvr();
                 if( bRet )
-                    UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                                SwCrsrShell::READONLY );
+                    UpdateCursor( SwCursorShell::SCROLLWIN | SwCursorShell::CHKRANGE |
+                                SwCursorShell::READONLY );
             }
         }
     }
@@ -257,7 +257,7 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
 }
 
 /// jump to the next index
-bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
+bool SwCursorShell::GotoNextTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
@@ -271,7 +271,7 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
             SwSectionNode const*const pSectNd(
                     pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
-                && m_pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex()
+                && m_pCurrentCursor->GetPoint()->nNode < pSectNd->GetIndex()
                 && (!pFnd  || pFnd->GetIndex() > pSectNd->GetIndex())
                 && (!pName || *pName ==
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
@@ -283,10 +283,10 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwContentFrm const*const pCFrm(
-                            pCNd->getLayoutFrm(GetLayout()));
-                    if (pCFrm &&
-                        (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
+                    SwContentFrame const*const pCFrame(
+                            pCNd->getLayoutFrame(GetLayout()));
+                    if (pCFrame &&
+                        (IsReadOnlyAvailable() || !pCFrame->IsProtected()))
                     {
                         pFnd = pCNd;
                     }
@@ -296,19 +296,19 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
     }
     if( pFnd )
     {
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
-        m_pCurCrsr->GetPoint()->nNode = *pFnd;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pFnd, 0 );
-        bRet = !m_pCurCrsr->IsSelOvr();
+        SwCallLink aLk( *this ); // watch Cursor-Moves
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
+        m_pCurrentCursor->GetPoint()->nNode = *pFnd;
+        m_pCurrentCursor->GetPoint()->nContent.Assign( pFnd, 0 );
+        bRet = !m_pCurrentCursor->IsSelOvr();
         if( bRet )
-            UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+            UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     }
     return bRet;
 }
 
 /// jump to previous index
-bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
+bool SwCursorShell::GotoPrevTOXBase( const OUString* pName )
 {
     bool bRet = false;
 
@@ -322,7 +322,7 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
             SwSectionNode const*const pSectNd(
                     pSect->GetFormat()->GetSectionNode());
             if (   pSectNd
-                && m_pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex()
+                && m_pCurrentCursor->GetPoint()->nNode > pSectNd->EndOfSectionIndex()
                 && (!pFnd  || pFnd->GetIndex() < pSectNd->GetIndex())
                 && (!pName || *pName ==
                     static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
@@ -334,10 +334,10 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
                 if (pCNd &&
                     pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
                 {
-                    SwContentFrm const*const pCFrm(
-                            pCNd->getLayoutFrm(GetLayout()));
-                    if (pCFrm &&
-                        (IsReadOnlyAvailable() || !pCFrm->IsProtected()))
+                    SwContentFrame const*const pCFrame(
+                            pCNd->getLayoutFrame(GetLayout()));
+                    if (pCFrame &&
+                        (IsReadOnlyAvailable() || !pCFrame->IsProtected()))
                     {
                         pFnd = pCNd;
                     }
@@ -348,24 +348,24 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
 
     if( pFnd )
     {
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
-        m_pCurCrsr->GetPoint()->nNode = *pFnd;
-        m_pCurCrsr->GetPoint()->nContent.Assign( pFnd, 0 );
-        bRet = !m_pCurCrsr->IsSelOvr();
+        SwCallLink aLk( *this ); // watch Cursor-Moves
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
+        m_pCurrentCursor->GetPoint()->nNode = *pFnd;
+        m_pCurrentCursor->GetPoint()->nContent.Assign( pFnd, 0 );
+        bRet = !m_pCurrentCursor->IsSelOvr();
         if( bRet )
-            UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+            UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
     }
     return bRet;
 }
 
 /// jump to index of TOXMark
-bool SwCrsrShell::GotoTOXMarkBase()
+bool SwCursorShell::GotoTOXMarkBase()
 {
     bool bRet = false;
 
     SwTOXMarks aMarks;
-    sal_uInt16 nCnt = SwDoc::GetCurTOXMark( *m_pCurCrsr->GetPoint(), aMarks );
+    sal_uInt16 nCnt = SwDoc::GetCurTOXMark( *m_pCurrentCursor->GetPoint(), aMarks );
     if( nCnt )
     {
         // Take the 1. and get the index type. Search in its dependency list
@@ -385,20 +385,20 @@ bool SwCrsrShell::GotoTOXMarkBase()
                 SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
                 if( !pCNd )
                     pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
-                const SwContentFrm* pCFrm;
+                const SwContentFrame* pCFrame;
                 if( pCNd &&
                     pCNd->EndOfSectionIndex() < pSectNd->EndOfSectionIndex() &&
-                    nullptr != ( pCFrm = pCNd->getLayoutFrm( GetLayout() ) ) &&
-                    ( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
+                    nullptr != ( pCFrame = pCNd->getLayoutFrame( GetLayout() ) ) &&
+                    ( IsReadOnlyAvailable() || !pCFrame->IsProtected() ))
                 {
-                    SwCallLink aLk( *this ); // watch Crsr-Moves
-                    SwCrsrSaveState aSaveState( *m_pCurCrsr );
-                    m_pCurCrsr->GetPoint()->nNode = *pCNd;
-                    m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, 0 );
-                    bRet = !m_pCurCrsr->IsInProtectTable() &&
-                            !m_pCurCrsr->IsSelOvr();
+                    SwCallLink aLk( *this ); // watch Cursor-Moves
+                    SwCursorSaveState aSaveState( *m_pCurrentCursor );
+                    m_pCurrentCursor->GetPoint()->nNode = *pCNd;
+                    m_pCurrentCursor->GetPoint()->nContent.Assign( pCNd, 0 );
+                    bRet = !m_pCurrentCursor->IsInProtectTable() &&
+                            !m_pCurrentCursor->IsSelOvr();
                     if( bRet )
-                        UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
+                        UpdateCursor(SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
                     break;
                 }
             }
@@ -409,13 +409,13 @@ bool SwCrsrShell::GotoTOXMarkBase()
 
 /// Jump to next/previous table formula
 /// Optionally it is possible to also jump to broken formulas
-bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
+bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
 {
     if( IsTableMode() )
         return false;
 
     bool bFnd = false;
-    SwPosition& rPos = *m_pCurCrsr->GetPoint();
+    SwPosition& rPos = *m_pCurrentCursor->GetPoint();
 
     Point aPt;
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
@@ -436,7 +436,7 @@ bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
 
     if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
         // also at collection use only the first frame
-        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetContentNode()->getLayoutFrm( GetLayout(),
+        aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetContentNode()->getLayoutFrame( GetLayout(),
                                 &aPt, &rPos, false ) );
     {
         sal_uInt32 n, nMaxItems = GetDoc()->GetAttrPool().GetItemCount2( RES_BOXATR_FORMULA );
@@ -453,14 +453,14 @@ bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
                 ( !bOnlyErrors ||
                   !static_cast<const SwTableBoxFormula*>(pItem)->HasValidBoxes() ) )
             {
-                const SwContentFrm* pCFrm;
+                const SwContentFrame* pCFrame;
                 SwNodeIndex aIdx( *pTBox->GetSttNd() );
                 const SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
-                if( pCNd && nullptr != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, nullptr, false ) ) &&
-                    (IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
+                if( pCNd && nullptr != ( pCFrame = pCNd->getLayoutFrame( GetLayout(), &aPt, nullptr, false ) ) &&
+                    (IsReadOnlyAvailable() || !pCFrame->IsProtected() ))
                 {
                     _SetGetExpField aCmp( *pTBox );
-                    aCmp.SetBodyPos( *pCFrm );
+                    aCmp.SetBodyPos( *pCFrame );
 
                     if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
                               : ( aCmp < aCurGEF && aFndGEF < aCmp ))
@@ -476,28 +476,28 @@ bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
     if( bFnd )
     {
         SET_CURR_SHELL( this );
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
+        SwCallLink aLk( *this ); // watch Cursor-Moves
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
         aFndGEF.GetPosOfContent( rPos );
-        m_pCurCrsr->DeleteMark();
+        m_pCurrentCursor->DeleteMark();
 
-        bFnd = !m_pCurCrsr->IsSelOvr();
+        bFnd = !m_pCurrentCursor->IsSelOvr();
         if( bFnd )
-            UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                        SwCrsrShell::READONLY );
+            UpdateCursor( SwCursorShell::SCROLLWIN | SwCursorShell::CHKRANGE |
+                        SwCursorShell::READONLY );
     }
     return bFnd;
 }
 
 /// jump to next/previous index marker
-bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
+bool SwCursorShell::GotoNxtPrvTOXMark( bool bNext )
 {
     if( IsTableMode() )
         return false;
 
     bool bFnd = false;
-    SwPosition& rPos = *m_pCurCrsr->GetPoint();
+    SwPosition& rPos = *m_pCurrentCursor->GetPoint();
 
     Point aPt;
     SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
@@ -508,7 +508,7 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
     if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() )
         // also at collection use only the first frame
         aCurGEF.SetBodyPos( *rPos.nNode.GetNode().
-                        GetContentNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
+                        GetContentNode()->getLayoutFrame( GetLayout(), &aPt, &rPos, false ) );
 
     {
         const SwTextNode* pTextNd;
@@ -518,18 +518,18 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
         for( n = 0; n < nMaxItems; ++n )
         {
             const SfxPoolItem* pItem;
-            const SwContentFrm* pCFrm;
+            const SwContentFrame* pCFrame;
 
             if( nullptr != (pItem = GetDoc()->GetAttrPool().GetItem2(
                                         RES_TXTATR_TOXMARK, n ) ) &&
                 nullptr != (pTextTOX = static_cast<const SwTOXMark*>(pItem)->GetTextTOXMark() ) &&
                 ( pTextNd = &pTextTOX->GetTextNode())->GetNodes().IsDocNodes() &&
-                nullptr != ( pCFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, nullptr, false )) &&
-                ( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
+                nullptr != ( pCFrame = pTextNd->getLayoutFrame( GetLayout(), &aPt, nullptr, false )) &&
+                ( IsReadOnlyAvailable() || !pCFrame->IsProtected() ))
             {
                 SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object
                 _SetGetExpField aCmp( aNdIndex, *pTextTOX, nullptr );
-                aCmp.SetBodyPos( *pCFrm );
+                aCmp.SetBodyPos( *pCFrame );
 
                 if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
                           : ( aCmp < aCurGEF && aFndGEF < aCmp ))
@@ -544,38 +544,38 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
     if( bFnd )
     {
         SET_CURR_SHELL( this );
-        SwCallLink aLk( *this ); // watch Crsr-Moves
-        SwCrsrSaveState aSaveState( *m_pCurCrsr );
+        SwCallLink aLk( *this ); // watch Cursor-Moves
+        SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
         aFndGEF.GetPosOfContent( rPos );
 
-        bFnd = !m_pCurCrsr->IsSelOvr();
+        bFnd = !m_pCurrentCursor->IsSelOvr();
         if( bFnd )
-            UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
-                        SwCrsrShell::READONLY );
+            UpdateCursor( SwCursorShell::SCROLLWIN | SwCursorShell::CHKRANGE |
+                        SwCursorShell::READONLY );
     }
     return bFnd;
 }
 
 /// traveling between marks
-const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
+const SwTOXMark& SwCursorShell::GotoTOXMark( const SwTOXMark& rStart,
                                             SwTOXSearch eDir )
 {
     SET_CURR_SHELL( this );
-    SwCallLink aLk( *this ); // watch Crsr-Moves
-    SwCrsrSaveState aSaveState( *m_pCurCrsr );
+    SwCallLink aLk( *this ); // watch Cursor-Moves
+    SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
     const SwTOXMark& rNewMark = GetDoc()->GotoTOXMark( rStart, eDir,
                                                     IsReadOnlyAvailable() );
     // set position
-    SwPosition& rPos = *GetCrsr()->GetPoint();

path: root/odk/Package_settings.mk

# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#

$(eval $(call gb_Package_Package,odk_settings,$(SRCDIR)/odk/settings))

$(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR)))

$(eval $(call gb_Package_add_files,odk_settings,$(SDKDIRNAME)/settings,\
	$(if $(filter WNT,$(OS)),component.uno.def) \
	platform.mk \
	settings.mk \
	std.mk \
	stdtarget.mk \
))

# vim: set noet sw=4 ts=4: