Avoid reserved identifiers

Change-Id: I27ff0f4f0eb395d7e0a60dd604758c220a3134c4

30 files changed, 368 insertions, 368 deletions

diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 1aee7002a4ef..bd827289f405 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -423,7 +423,7 @@ void ContentIdxStoreImpl::SaveShellCursors(SwDoc* pDoc, sal_uLong nNode, sal_Int
                 } while ( (_pStackCursor != nullptr ) &&
                     ((_pStackCursor = _pStackCursor->GetNext()) != static_cast<SwCursorShell*>(&rCurShell)->GetStackCursor()) );
 
-            for(SwPaM& rPaM : (static_cast<SwCursorShell*>(&rCurShell)->_GetCursor())->GetRingContainer())
+            for(SwPaM& rPaM : (static_cast<SwCursorShell*>(&rCurShell)->GetCursor_())->GetRingContainer())
             {
                 lcl_ChkPaMBoth( m_aShellCursorEntries, nNode, nContent, rPaM);
             }
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e2b8af4894d1..4e9177ca6899 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -124,7 +124,7 @@ namespace
 
     /*
         The lcl_CopyBookmarks function has to copy bookmarks from the source to the destination nodes
-        array. It is called after a call of the _CopyNodes(..) function. But this function does not copy
+        array. It is called after a call of the CopyNodes(..) function. But this function does not copy
         every node (at least at the moment: 2/08/2006 ), section start and end nodes will not be copied
         if the corresponding end/start node is outside the copied pam.
         The lcl_NonCopyCount function counts the number of these nodes, given the copied pam and a node
@@ -196,7 +196,7 @@ namespace
         rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetContentNode(), nContentPos );
     }
 
-    // TODO: use SaveBookmark (from _DelBookmarks)
+    // TODO: use SaveBookmark (from DelBookmarks)
     void lcl_CopyBookmarks(
         const SwPaM& rPam,
         SwPaM& rCpyPam )
@@ -550,14 +550,14 @@ namespace
         return false;
     }
 
-    struct _SaveRedline
+    struct SaveRedline
     {
         SwRangeRedline* pRedl;
         sal_uInt32 nStt, nEnd;
         sal_Int32 nSttCnt;
         sal_Int32 nEndCnt;
 
-        _SaveRedline( SwRangeRedline* pR, const SwNodeIndex& rSttIdx )
+        SaveRedline( SwRangeRedline* pR, const SwNodeIndex& rSttIdx )
             : pRedl(pR)
             , nEnd(0)
             , nEndCnt(0)
@@ -579,7 +579,7 @@ namespace
             pRedl->GetMark()->nContent.Assign( nullptr, 0 );
         }
 
-        _SaveRedline( SwRangeRedline* pR, const SwPosition& rPos )
+        SaveRedline( SwRangeRedline* pR, const SwPosition& rPos )
             : pRedl(pR)
             , nEnd(0)
             , nEndCnt(0)
@@ -628,7 +628,7 @@ namespace
         }
     };
 
-    typedef std::vector< _SaveRedline > SaveRedlines_t;
+    typedef std::vector< SaveRedline > SaveRedlines_t;
 
     void lcl_SaveRedlines(const SwPaM& aPam, SaveRedlines_t& rArr)
     {
@@ -688,7 +688,7 @@ namespace
                 }
 
                 // save the current redline
-                rArr.push_back(_SaveRedline( pCurrent, *pStart ));
+                rArr.push_back(SaveRedline( pCurrent, *pStart ));
             }
         }
 
@@ -744,7 +744,7 @@ namespace
                     pTmpPos->nContent.Assign(
                                 pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
-                    rArr.push_back(_SaveRedline(pNewRedl, rRg.aStart));
+                    rArr.push_back(SaveRedline(pNewRedl, rRg.aStart));
 
                     pTmpPos = pTmp->End();
                     pTmpPos->nNode = rRg.aEnd;
@@ -766,7 +766,7 @@ namespace
                     ( pREnd->nNode == rRg.aEnd && !pREnd->nContent.GetIndex()) )
                 {
                     // move everything
-                    rArr.push_back(_SaveRedline( pTmp, rRg.aStart ));
+                    rArr.push_back(SaveRedline( pTmp, rRg.aStart ));
                 }
                 else
                 {
@@ -777,7 +777,7 @@ namespace
                     pTmpPos->nContent.Assign(
                                 pTmpPos->nNode.GetNode().GetContentNode(), 0 );
 
-                    rArr.push_back(_SaveRedline( pNewRedl, rRg.aStart ));
+                    rArr.push_back(SaveRedline( pNewRedl, rRg.aStart ));
 
                     pTmpPos = pTmp->Start();
                     pTmpPos->nNode = rRg.aEnd;
@@ -1733,7 +1733,7 @@ void DocumentContentOperationsManager::DeleteSection( SwNode *pNode )
     // delete all Flys, Bookmarks, ...
     DelFlyInRange( aSttIdx, aEndIdx );
     m_rDoc.getIDocumentRedlineAccess().DeleteRedline( *pSttNd, true, USHRT_MAX );
-    _DelBookmarks(aSttIdx, aEndIdx);
+    DelBookmarks(aSttIdx, aEndIdx);
 
     {
         // move all Cursor/StackCursor/UnoCursor out of the to-be-deleted area
@@ -1910,8 +1910,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         return false;
 
     // Save the paragraph anchored Flys, so that they can be moved.
-    _SaveFlyArr aSaveFlyArr;
-    _SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, bool( SwMoveFlags::ALLFLYS & eMvFlags ) );
+    SaveFlyArr aSaveFlyArr;
+    SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, bool( SwMoveFlags::ALLFLYS & eMvFlags ) );
 
     // save redlines (if DOC_MOVEREDLINES is used)
     SaveRedlines_t aSaveRedl;
@@ -1924,7 +1924,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
         //          will change this order. Hence, we delete bookmarks
         //          here without undo.
         ::sw::UndoGuard const undoGuard(m_rDoc.GetIDocumentUndoRedo());
-        _DelBookmarks(
+        DelBookmarks(
             pStt->nNode,
             pEnd->nNode,
             nullptr,
@@ -2024,7 +2024,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     // Copy all Bookmarks that are within the Move range into an array,
     // that saves the position as an offset.
     ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks;
-    _DelBookmarks(
+    DelBookmarks(
         pStt->nNode,
         pEnd->nNode,
         &aSaveBkmks,
@@ -2141,7 +2141,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
     *rPaM.GetPoint() = *aSavePam.End();
 
     // Move the Flys to the new position.
-    _RestFlyInRange( aSaveFlyArr, rPaM.Start()->nNode, &(rPos.nNode) );
+    RestFlyInRange( aSaveFlyArr, rPaM.Start()->nNode, &(rPos.nNode) );
 
     // restore redlines (if DOC_MOVEREDLINES is used)
     if( !aSaveRedl.empty() )
@@ -2217,12 +2217,12 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
     // that stores all references to positions as an offset.
     // The final mapping happens after the Move.
     ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks;
-    _DelBookmarks(rRange.aStart, rRange.aEnd, &aSaveBkmks);
+    DelBookmarks(rRange.aStart, rRange.aEnd, &aSaveBkmks);
 
     // Save the paragraph-bound Flys, so that they can be moved.
-    _SaveFlyArr aSaveFlyArr;
+    SaveFlyArr aSaveFlyArr;
     if( !m_rDoc.GetSpzFrameFormats()->empty() )
-        _SaveFlyInRange( rRange, aSaveFlyArr );
+        SaveFlyInRange( rRange, aSaveFlyArr );
 
     // Set it to before the Position, so that it cannot be moved further.
     SwNodeIndex aIdx( rPos, -1 );
@@ -2233,7 +2233,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // move the Nodes
     bool bNoDelFrames = bool(SwMoveFlags::NO_DELFRMS & eMvFlags);
-    if( m_rDoc.GetNodes()._MoveNodes( rRange, m_rDoc.GetNodes(), rPos, !bNoDelFrames ) )
+    if( m_rDoc.GetNodes().MoveNodes( rRange, m_rDoc.GetNodes(), rPos, !bNoDelFrames ) )
     {
         ++aIdx;     // again back to old position
         if( pSaveInsPos )
@@ -2248,7 +2248,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
 
     // move the Flys to the new position
     if( !aSaveFlyArr.empty() )
-        _RestFlyInRange( aSaveFlyArr, aIdx, nullptr );
+        RestFlyInRange( aSaveFlyArr, aIdx, nullptr );
 
     // Add the Bookmarks back to the Document
     for(
@@ -2612,7 +2612,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfName, rFltName, pGraphic,
                             m_rDoc.GetDfltGrfFormatColl() );
-    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+    SwFlyFrameFormat* pSwFlyFrameFormat = InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
                             pFlyAttrSet, pGrfAttrSet, pFrameFormat );
     return pSwFlyFrameFormat;
 }
@@ -2627,7 +2627,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, co
     SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfObj, m_rDoc.GetDfltGrfFormatColl() );
-    SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+    SwFlyFrameFormat* pSwFlyFrameFormat = InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
                             pFlyAttrSet, pGrfAttrSet, pFrameFormat );
     return pSwFlyFrameFormat;
 }
@@ -2649,7 +2649,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, con
 
         pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
     }
-    return _InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
+    return InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             xObj,
                             m_rDoc.GetDfltGrfFormatColl() ),
@@ -2666,7 +2666,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg,
     if( !pFrameFormat )
         pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_OLE );
 
-    return _InsNoTextNode( *rRg.GetPoint(),
+    return InsNoTextNode( *rRg.GetPoint(),
                             m_rDoc.GetNodes().MakeOLENode(
                                 SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                                 rObjName,
@@ -3155,11 +3155,11 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 
     SwDoc* pDest = rInsPos.GetNode().GetDoc();
 
-    _SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
+    SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
 
     SwNodeIndex aSavePos( rInsPos, -1 );
     bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
-    m_rDoc.GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrames, true );
+    m_rDoc.GetNodes().CopyNodes( rRg, rInsPos, bMakeNewFrames, true );
     ++aSavePos;
     if( bEndIsEqualEndPos )
         const_cast<SwNodeIndex&>(rRg.aEnd) = aSavePos;
@@ -3195,7 +3195,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
     SwNodeRange aCpyRange( aSavePos, rInsPos );
 
     // Also copy all bookmarks
-    // guess this must be done before the _DelDummyNodes below as that
+    // guess this must be done before the DelDummyNodes below as that
     // deletes nodes so would mess up the index arithmetic
     if( m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() )
     {
@@ -3218,7 +3218,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
     if( bDelRedlines && ( nsRedlineMode_t::REDLINE_DELETE_REDLINES & pDest->getIDocumentRedlineAccess().GetRedlineMode() ))
         lcl_DeleteRedlines( rRg, aCpyRange );
 
-    pDest->GetNodes()._DelDummyNodes( aCpyRange );
+    pDest->GetNodes().DelDummyNodes( aCpyRange );
 }
 
 // TODO: there is a limitation here in that it's not possible to pass a start
@@ -3237,7 +3237,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
     // and then only copy them. This maintains the ordering numbers (which are only
     // managed in the DrawModel).
     SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
-    ::std::set< _ZSortFly > aSet;
+    ::std::set< ZSortFly > aSet;
     const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size();
 
     SwTextBoxHelper::SavedLink aOldTextBoxes;
@@ -3322,7 +3322,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
             // Make sure draw formats don't refer to content, so that such
             // content can be removed without problems.
             SwTextBoxHelper::resetLink(pFormat, aOldContent);
-            aSet.insert( _ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
+            aSet.insert( ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
         }
     }
 
@@ -3330,7 +3330,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
     // They are stored as matching the originals, so that we will be later
     // able to build the chains accordingly.
     ::std::vector< SwFrameFormat* > aVecSwFrameFormat;
-    ::std::set< _ZSortFly >::const_iterator it=aSet.begin();
+    ::std::set< ZSortFly >::const_iterator it=aSet.begin();
 
     while (it != aSet.end())
     {
@@ -3343,7 +3343,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
         // position can *not* be determined by the difference of the current
         // anchor position to the start of the copied range, because not
         // complete selected sections in the copied range aren't copied - see
-        // method <SwNodes::_CopyNodes(..)>.
+        // method <SwNodes::CopyNodes(..)>.
         // Thus, the new anchor position in the destination document is found
         // by counting the text nodes.
         if ((aAnchor.GetAnchorId() == FLY_AT_PARA) ||
@@ -3448,14 +3448,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
     if ( aSet.size() == aVecSwFrameFormat.size() )
     {
         size_t n = 0;
-        for (::std::set< _ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n )
+        for (::std::set< ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n )
         {
             const SwFrameFormat *pFormatN = (*nIt).GetFormat();
             const SwFormatChain &rChain = pFormatN->GetChain();
             int nCnt = int(nullptr != rChain.GetPrev());
             nCnt += rChain.GetNext() ? 1: 0;
             size_t k = 0;
-            for (::std::set< _ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k )
+            for (::std::set< ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k )
             {
                 const SwFrameFormat *pFormatK = (*kIt).GetFormat();
                 if ( rChain.GetPrev() == pFormatK )
@@ -3696,7 +3696,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
 
     // Delete and move all "Flys at the paragraph", which are within the Selection
     DelFlyInRange(rPam.GetMark()->nNode, rPam.GetPoint()->nNode);
-    _DelBookmarks(
+    DelBookmarks(
         pStt->nNode,
         pEnd->nNode,
         nullptr,
@@ -4042,7 +4042,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
     return bRet;
 }
 
-SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode,
+SwFlyFrameFormat* DocumentContentOperationsManager::InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode,
                                     const SfxItemSet* pFlyAttrSet,
                                     const SfxItemSet* pGrfAttrSet,
                                     SwFrameFormat* pFrameFormat)
@@ -4050,7 +4050,7 @@ SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosi
     SwFlyFrameFormat *pFormat = nullptr;
     if( pNode )
     {
-        pFormat = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
+        pFormat = m_rDoc.MakeFlySection_( rPos, *pNode, FLY_AT_PARA,
                                 pFlyAttrSet, pFrameFormat );
         if( pGrfAttrSet )
             pNode->SetAttr( *pGrfAttrSet );
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index dfc542de6667..e45ddf8f4fa4 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -213,9 +213,9 @@ SwDrawModel* DocumentDrawModelManager::GetDrawModel()
     return mpDrawModel;
 }
 
-SwDrawModel* DocumentDrawModelManager::_MakeDrawModel()
+SwDrawModel* DocumentDrawModelManager::MakeDrawModel_()
 {
-    OSL_ENSURE( !mpDrawModel, "_MakeDrawModel: Why?" );
+    OSL_ENSURE( !mpDrawModel, "MakeDrawModel_: Why?" );
     InitDrawModel();
     SwViewShell* const pSh = m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell();
     if ( pSh )
@@ -235,7 +235,7 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel()
 
 SwDrawModel* DocumentDrawModelManager::GetOrCreateDrawModel()
 {
-    return GetDrawModel() ? GetDrawModel() : _MakeDrawModel();
+    return GetDrawModel() ? GetDrawModel() : MakeDrawModel_();
 }
 
 SdrLayerID DocumentDrawModelManager::GetHeavenId() const
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index ea5350fca740..199ccccfde13 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -77,7 +77,7 @@ namespace
 
     #endif
 
-    void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpField& rSGEField,
+    void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const SetGetExpField& rSGEField,
                             SwDBManager* pMgr )
     {
         const SwTextField* pTextField = rSGEField.GetTextField();
@@ -708,7 +708,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
                         {
                             SwPosition aPos( *pTableNd );
                             if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) )
-                                FieldsToCalc( *pCalc, _SetGetExpField(
+                                FieldsToCalc( *pCalc, SetGetExpField(
                                     aPos.nNode, pFormatField->GetTextField(),
                                     &aPos.nContent ));
                             else
@@ -720,7 +720,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
                         // create index to determine the TextNode
                         SwNodeIndex aIdx( rTextNd );
                         FieldsToCalc( *pCalc,
-                            _SetGetExpField( aIdx, pFormatField->GetTextField() ));
+                            SetGetExpField( aIdx, pFormatField->GetTextField() ));
                     }
 
                     SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
@@ -777,7 +777,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
                         {
                             SwPosition aPos( *pCNd );
                             if( GetBodyTextNode( m_rDoc, aPos, *pFrame ) )
-                                FieldsToCalc( *pCalc, _SetGetExpField( aPos.nNode ));
+                                FieldsToCalc( *pCalc, SetGetExpField( aPos.nNode ));
                             else
                                 pFrame = nullptr;
                         }
@@ -786,7 +786,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
                     {
                         // create index to determine the TextNode
                         SwNodeIndex aIdx( *pTableNd );
-                        FieldsToCalc( *pCalc, _SetGetExpField( aIdx ));
+                        FieldsToCalc( *pCalc, SetGetExpField( aIdx ));
                     }
 
                     SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
@@ -852,7 +852,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
     const sal_uInt16 nStrFormatCnt = static_cast<sal_uInt16>(nHashSize);
     OSL_ENSURE( nStrFormatCnt == nHashSize, "Downcasting to sal_uInt16 lost information!" );
     SwHash** pHashStrTable = new SwHash*[ nStrFormatCnt ];
-    memset( pHashStrTable, 0, sizeof( _HashStr* ) * nStrFormatCnt );
+    memset( pHashStrTable, 0, sizeof( HashStr* ) * nStrFormatCnt );
 
     {
         const SwFieldType* pFieldType;
@@ -869,11 +869,11 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
                     SwHash* pFnd = Find( rNm, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // modify entry in the hash table
-                        static_cast<_HashStr*>(pFnd)->aSetStr = sExpand;
+                        static_cast<HashStr*>(pFnd)->aSetStr = sExpand;
                     else
                         // insert the new entry
-                        *(pHashStrTable + nPos ) = new _HashStr( rNm, sExpand,
-                                                static_cast<_HashStr*>(*(pHashStrTable + nPos)) );
+                        *(pHashStrTable + nPos ) = new HashStr( rNm, sExpand,
+                                                static_cast<HashStr*>(*(pHashStrTable + nPos)) );
                 }
                 break;
             case RES_SETEXPFLD:
@@ -900,7 +900,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
 
     // Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
     int nShownSections = 0;
-    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
+    for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
     {
         SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
         if ( pSect && !pSect->IsCondHidden())
@@ -908,7 +908,7 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
     }
 
     OUString aNew;
-    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
+    for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
     {
         SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
         if( pSect )
@@ -1017,13 +1017,13 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
             if( pFnd )
             {
                 // Modify entry in the hash table
-                static_cast<_HashStr*>(pFnd)->aSetStr = value;
+                static_cast<HashStr*>(pFnd)->aSetStr = value;
             }
             else
             {
                 // insert new entry
-                *(pHashStrTable + nPos ) = new _HashStr( rName,
-                    value, static_cast<_HashStr *>(*(pHashStrTable + nPos)));
+                *(pHashStrTable + nPos ) = new HashStr( rName,
+                    value, static_cast<HashStr *>(*(pHashStrTable + nPos)));
             }
 #endif
         }
@@ -1066,16 +1066,16 @@ void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUp
                     SwHash* pFnd = Find( aNew, pHashStrTable, nStrFormatCnt, &nPos );
                     if( pFnd )
                         // Modify entry in the hash table
-                        static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
+                        static_cast<HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                     else
                         // insert new entry
-                        *(pHashStrTable + nPos ) = pFnd = new _HashStr( aNew,
+                        *(pHashStrTable + nPos ) = pFnd = new HashStr( aNew,
                                         pSField->GetExpStr(),
-                                        static_cast<_HashStr*>(*(pHashStrTable + nPos) ));
+                                        static_cast<HashStr*>(*(pHashStrTable + nPos) ));
 
                     // Extension for calculation with Strings
                     SwSbxValue aValue;
-                    aValue.PutString( static_cast<_HashStr*>(pFnd)->aSetStr );
+                    aValue.PutString( static_cast<HashStr*>(pFnd)->aSetStr );
                     aCalc.VarChange( aNew, aValue );
                 }
             }
@@ -1377,7 +1377,7 @@ void DocumentFieldsManager::SetFixFields( const DateTime* pNewDateTime )
         m_rDoc.getIDocumentState().ResetModified();
 }
 
-void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& rToThisField )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
     mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
@@ -1392,10 +1392,10 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField&
 
     if( !mpUpdateFields->GetSortLst()->empty() )
     {
-        _SetGetExpFields::const_iterator const itLast =
+        SetGetExpFields::const_iterator const itLast =
             mpUpdateFields->GetSortLst()->upper_bound(
-                const_cast<_SetGetExpField*>(&rToThisField));
-        for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
+                const_cast<SetGetExpField*>(&rToThisField));
+        for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
             lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
     }
 #if HAVE_FEATURE_DBCONNECTIVITY
@@ -1416,7 +1416,7 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_
     pMgr->CloseAll(false);
 #endif
 
-    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin();
+    for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin();
         it != mpUpdateFields->GetSortLst()->end() &&
         ( (*it)->GetNode() < nLastNd ||
           ( (*it)->GetNode() == nLastNd && (*it)->GetContent() <= nLastCnt )
@@ -1432,7 +1432,7 @@ void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_
 }
 
 void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& rTableSize,
-                            const _SetGetExpField& rToThisField )
+                            const SetGetExpField& rToThisField )
 {
     // create the sorted list of all SetFields
     mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND );
@@ -1442,13 +1442,13 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r
     // Try to fabricate an uneven number.
     rTableSize = (( mpUpdateFields->GetSortLst()->size() / 7 ) + 1 ) * 7;
     ppHashTable = new SwHash*[ rTableSize ];
-    memset( ppHashTable, 0, sizeof( _HashStr* ) * rTableSize );
+    memset( ppHashTable, 0, sizeof( HashStr* ) * rTableSize );
 
-    _SetGetExpFields::const_iterator const itLast =
+    SetGetExpFields::const_iterator const itLast =
         mpUpdateFields->GetSortLst()->upper_bound(
-            const_cast<_SetGetExpField*>(&rToThisField));
+            const_cast<SetGetExpField*>(&rToThisField));
 
-    for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
+    for( SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
     {
         const SwTextField* pTextField = (*it)->GetTextField();
         if( !pTextField )
@@ -1479,11 +1479,11 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r
                 SwHash* pFnd = Find( aNew, ppHashTable, rTableSize, &nPos );
                 if( pFnd )
                     // modify entry in the hash table
-                    static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
+                    static_cast<HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
                 else
                     // insert the new entry
-                    *(ppHashTable + nPos ) = new _HashStr( aNew,
-                            pSField->GetExpStr(), static_cast<_HashStr*>(*(ppHashTable + nPos)) );
+                    *(ppHashTable + nPos ) = new HashStr( aNew,
+                            pSField->GetExpStr(), static_cast<HashStr*>(*(ppHashTable + nPos)) );
             }
             break;
         case RES_DBFLD:
@@ -1498,13 +1498,13 @@ void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& r
                 if( pFnd )
                 {
                     // modify entry in the hash table
-                    static_cast<_HashStr*>(pFnd)->aSetStr = value;
+                    static_cast<HashStr*>(pFnd)->aSetStr = value;
                 }
                 else
                 {
                     // insert the new entry
-                    *(ppHashTable + nPos ) = new _HashStr( rName,
-                        value, static_cast<_HashStr *>(*(ppHashTable + nPos)));
+                    *(ppHashTable + nPos ) = new HashStr( rName,
+                        value, static_cast<HashStr *>(*(ppHashTable + nPos)));
                 }
             }
             break;
@@ -1566,7 +1566,7 @@ void DocumentFieldsManager::GCFieldTypes()
             RemoveFieldType( n );
 }
 
-void DocumentFieldsManager::_InitFieldTypes()       // is being called by the CTOR
+void DocumentFieldsManager::InitFieldTypes()       // is being called by the CTOR
 {
     // Field types
     mpFieldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index cd75d2416342..73b891425b30 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -51,13 +51,13 @@ using namespace ::com::sun::star;
 //Helper functions for this file
 namespace
 {
-    struct _FindItem
+    struct FindItem
     {
         const OUString m_Item;
         SwTableNode* pTableNd;
         SwSectionNode* pSectNd;
 
-        explicit _FindItem(const OUString& rS)
+        explicit FindItem(const OUString& rS)
             : m_Item(rS), pTableNd(nullptr), pSectNd(nullptr)
         {}
      };
@@ -110,7 +110,7 @@ namespace
     }
 
 
-    bool lcl_FindSection( const SwSectionFormat* pSectFormat, _FindItem * const pItem, bool bCaseSensitive )
+    bool lcl_FindSection( const SwSectionFormat* pSectFormat, FindItem * const pItem, bool bCaseSensitive )
     {
         SwSection* pSect = pSectFormat->GetSection();
         if( pSect )
@@ -139,7 +139,7 @@ namespace
         return true;
     }
 
-    bool lcl_FindTable( const SwFrameFormat* pTableFormat, _FindItem * const pItem )
+    bool lcl_FindTable( const SwFrameFormat* pTableFormat, FindItem * const pItem )
     {
         OUString sNm( GetAppCharClass().lowercase( pTableFormat->GetName() ));
         if ( sNm == pItem->m_Item )
@@ -253,7 +253,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
 
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
-        _FindItem aPara( sItem );
+        FindItem aPara( sItem );
         for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
             if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
@@ -269,7 +269,7 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
         bCaseSensitive = false;
     }
 
-    _FindItem aPara( GetAppCharClass().lowercase( rItem ));
+    FindItem aPara( GetAppCharClass().lowercase( rItem ));
     for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
         if (!(lcl_FindTable(pFormat, &aPara)))
@@ -298,7 +298,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
 
         // Do we already have the Item?
         OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
-        _FindItem aPara( sItem );
+        FindItem aPara( sItem );
         for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
             if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
@@ -315,7 +315,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
     }
 
     OUString sItem(GetAppCharClass().lowercase(rItem));
-    _FindItem aPara( sItem );
+    FindItem aPara( sItem );
     for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
         if (!(lcl_FindTable(pFormat, &aPara)))
@@ -346,7 +346,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
         if(pObj)
             return pObj;
 
-        _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
+        FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         // sections
         for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
         {
@@ -369,7 +369,7 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
         bCaseSensitive = false;
     }
 
-    _FindItem aPara( GetAppCharClass().lowercase(rItem) );
+    FindItem aPara( GetAppCharClass().lowercase(rItem) );
     // tables
     for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
     {
@@ -454,7 +454,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
         OUString sCmp( sItem.copy( nPos + 1 ));
         sItem = rCC.lowercase( sItem );
 
-        _FindItem aPara( sName );
+        FindItem aPara( sName );
 
         if( sCmp == "table" )
         {
@@ -536,7 +536,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
             return static_cast<bool>(rpPam);
         }
 
-        _FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) );
+        FindItem aPara( bCaseSensitive ? sItem : rCC.lowercase( sItem ) );
 
         if( !m_rDoc.GetSections().empty() )
         {
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index a4a31be608fd..9c1cd3368e8b 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1163,10 +1163,10 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
             switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
             {
                 case POOLGRP_CHARFMT:
-                    pNewFormat = m_rDoc._MakeCharFormat(aNm, pDeriveFormat, false, true);
+                    pNewFormat = m_rDoc.MakeCharFormat_(aNm, pDeriveFormat, false, true);
                     break;
                 case POOLGRP_FRAMEFMT:
-                    pNewFormat = m_rDoc._MakeFrameFormat(aNm, pDeriveFormat, false, true);
+                    pNewFormat = m_rDoc.MakeFrameFormat_(aNm, pDeriveFormat, false, true);
                     break;
                 default:
                     break;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1e15fe7a9c38..3462e97f08f2 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -500,10 +500,10 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
     getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD)->UpdateFields();
 }
 
-struct _PostItField : public _SetGetExpField
+struct PostItField_ : public SetGetExpField
 {
-    _PostItField( const SwNodeIndex& rNdIdx, const SwTextField* pField,  const SwIndex* pIdx = nullptr )
-        : _SetGetExpField( rNdIdx, pField, pIdx ) {}
+    PostItField_( const SwNodeIndex& rNdIdx, const SwTextField* pField,  const SwIndex* pIdx = nullptr )
+        : SetGetExpField( rNdIdx, pField, pIdx ) {}
 
     sal_uInt16 GetPageNo( const StringRangeEnumerator &rRangeEnum,
             const std::set< sal_Int32 > &rPossiblePages,
@@ -515,7 +515,7 @@ struct _PostItField : public _SetGetExpField
     }
 };
 
-sal_uInt16 _PostItField::GetPageNo(
+sal_uInt16 PostItField_::GetPageNo(
     const StringRangeEnumerator &rRangeEnum,
     const std::set< sal_Int32 > &rPossiblePages,
     /* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo )
@@ -547,7 +547,7 @@ sal_uInt16 _PostItField::GetPageNo(
 
 bool sw_GetPostIts(
     IDocumentFieldsAccess* pIDFA,
-    _SetGetExpFields * pSrtLst )
+    SetGetExpFields * pSrtLst )
 {
     bool bHasPostIts = false;
 
@@ -568,7 +568,7 @@ bool sw_GetPostIts(
                 if (pSrtLst)
                 {
                     SwNodeIndex aIdx( pTextField->GetTextNode() );
-                    _PostItField* pNew = new _PostItField( aIdx, pTextField );
+                    PostItField_* pNew = new PostItField_( aIdx, pTextField );
                     pSrtLst->insert( pNew );
                 }
                 else
@@ -784,7 +784,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
     SwPostItMode nPostItMode = static_cast<SwPostItMode>( rOptions.getIntValue( "PrintAnnotationMode", 0 ) );
     OSL_ENSURE(nPostItMode == SwPostItMode::NONE || rData.HasPostItData(),
             "print post-its without post-it data?" );
-    const _SetGetExpFields::size_type nPostItCount =
+    const SetGetExpFields::size_type nPostItCount =
         rData.HasPostItData() ? rData.m_pPostItFields->size() : 0;
     if (nPostItMode != SwPostItMode::NONE && nPostItCount > 0)
     {
@@ -812,9 +812,9 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
         // already get them in the correct order
         sal_uInt16 nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0;
         bool bIsFirstPostIt = true;
-        for (_SetGetExpFields::size_type i = 0; i < nPostItCount; ++i)
+        for (SetGetExpFields::size_type i = 0; i < nPostItCount; ++i)
         {
-            _PostItField& rPostIt = static_cast<_PostItField&>(*(*rData.m_pPostItFields)[ i ]);
+            PostItField_& rPostIt = static_cast<PostItField_&>(*(*rData.m_pPostItFields)[ i ]);
             nLastPageNum = nPhyPageNum;
             nPhyPageNum = rPostIt.GetPageNo(
                     aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
@@ -1275,7 +1275,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
             }
 
             SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs );
-            GetNodes()._Copy( aRange, aEndOfDoc );
+            GetNodes().Copy_( aRange, aEndOfDoc );
         }
         const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls();
         for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index e8fff02eeac1..d87b9d567081 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1309,9 +1309,9 @@ void SaveBookmark::SetInDoc(
     }
 }
 
-// _DelBookmarks
+// DelBookmarks
 
-void _DelBookmarks(
+void DelBookmarks(
     const SwNodeIndex& rStt,
     const SwNodeIndex& rEnd,
     ::std::vector<SaveBookmark> * pSaveBkmk,
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index e0797bd849cc..5c1e6c603167 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -101,13 +101,13 @@ void SwDoc::DoUpdateAllCharts()
                 nullptr != ( pTableNd = pTmpTable->GetTableNode() ) &&
                 pTableNd->GetNodes().IsDocNodes() )
             {
-                _UpdateCharts( *pTmpTable, *pVSh );
+                UpdateCharts_( *pTmpTable, *pVSh );
             }
         }
     }
 }
 
-void SwDoc::_UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const
+void SwDoc::UpdateCharts_( const SwTable& rTable, SwViewShell const & rVSh ) const
 {
     OUString aName( rTable.GetFrameFormat()->GetName() );
     SwStartNode *pStNd;
@@ -138,7 +138,7 @@ void SwDoc::UpdateCharts( const OUString &rName ) const
         SwViewShell const * pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
 
         if( pVSh )
-            _UpdateCharts( *pTmpTable, *pVSh );
+            UpdateCharts_( *pTmpTable, *pVSh );
     }
 }
 
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0e2ee5e37e1e..d7cab28d9280 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -180,17 +180,17 @@ public:
 
 class Hash
 {
-    struct _HashData
+    struct HashData
     {
         sal_uLong nNext, nHash;
         const SwCompareLine* pLine;
 
-        _HashData()
+        HashData()
             : nNext( 0 ), nHash( 0 ), pLine(nullptr) {}
     };
 
     sal_uLong* pHashArr;
-    _HashData* pDataArr;
+    HashData* pDataArr;
     sal_uLong nCount, nPrime;
 
 public:
@@ -528,7 +528,7 @@ static const sal_uLong primes[] =
 };
     int i;
 
-    pDataArr = new _HashData[ nSize ];
+    pDataArr = new HashData[ nSize ];
     pDataArr[0].nNext = 0;
     pDataArr[0].nHash = 0;
     pDataArr[0].pLine = nullptr;
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index a93cc46acb04..9496e968cfd9 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -111,7 +111,7 @@ void PaMCorrAbs( const SwPaM& rRange,
                 } while ( (_pStackCursor != nullptr ) &&
                     ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) );
 
-            for(SwPaM& rPaM : const_cast<SwShellCursor*>(pCursorShell->_GetCursor())->GetRingContainer())
+            for(SwPaM& rPaM : const_cast<SwShellCursor*>(pCursorShell->GetCursor_())->GetRingContainer())
             {
                 lcl_PaMCorrAbs( rPaM, aStart, aEnd, aNewPos );
             }
@@ -214,7 +214,7 @@ void SwDoc::CorrAbs(
     SwPosition aStart(*rRange.Start());
     SwPosition aEnd(*rRange.End());
 
-    _DelBookmarks( aStart.nNode, aEnd.nNode, nullptr, &aStart.nContent, &aEnd.nContent );
+    DelBookmarks( aStart.nNode, aEnd.nNode, nullptr, &aStart.nContent, &aEnd.nContent );
 
     if(bMoveCursor)
         ::PaMCorrAbs(rRange, rNewPos);
@@ -226,7 +226,7 @@ void SwDoc::CorrAbs(
     const SwPosition& rNewPos,
     bool bMoveCursor )
 {
-    _DelBookmarks( rStartNode, rEndNode );
+    DelBookmarks( rStartNode, rEndNode );
 
     if(bMoveCursor)
     {
@@ -262,7 +262,7 @@ void PaMCorrRel( const SwNodeIndex &rOldNode,
                 } while ( (_pStackCursor != nullptr ) &&
                     ((_pStackCursor = static_cast<SwPaM *>(_pStackCursor->GetNext())) != pCursorShell->GetStackCursor()) );
 
-            SwPaM* pStartPaM = pCursorShell->_GetCursor();
+            SwPaM* pStartPaM = pCursorShell->GetCursor_();
             for(SwPaM& rPaM : pStartPaM->GetRingContainer())
             {
                 lcl_PaMCorrRel1( &rPaM, pOldNode, aNewPos, nCntIdx);
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index ebd8cc312f99..43cb12145782 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -290,7 +290,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHe
                 SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
                             *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
-                GetNodes()._Copy( aRange, aTmp, false );
+                GetNodes().Copy_( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
@@ -362,7 +362,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFo
                 SwNodeRange aRange( aRCnt.GetContentIdx()->GetNode(), 0,
                             *aRCnt.GetContentIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
-                GetNodes()._Copy( aRange, aTmp, false );
+                GetNodes().Copy_( aRange, aTmp, false );
                 aTmp = *pSttNd;
                 GetDocumentContentOperationsManager().CopyFlyInFlyImpl(aRange, 0, aTmp);
 
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index ff1f0bae3740..3edbe8b22429 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -178,7 +178,7 @@ static void lcl_AdjustPositioningAttr( SwDrawFrameFormat* _pFrameFormat,
     _pFrameFormat->PosAttrSet();
     // #i34750# - keep current object rectangle for  drawing
     // objects. The object rectangle is used on events from the drawing layer
-    // to adjust the positioning attributes - see <SwDrawContact::_Changed(..)>.
+    // to adjust the positioning attributes - see <SwDrawContact::Changed_(..)>.
     {
         const SwAnchoredObject* pAnchoredObj = pContact->GetAnchoredObj( &_rSdrObj );
         if ( dynamic_cast<const SwAnchoredDrawObject*>( pAnchoredObj) !=  nullptr )
@@ -478,7 +478,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
     return bCallBase;
 }
 
-_ZSortFly::_ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn,
+ZSortFly::ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAn,
                       sal_uInt32 nArrOrdNum )
     : pFormat( pFrameFormat ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
 {
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 02df0f3e5605..ad4c8dbdccf7 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -53,14 +53,14 @@ using namespace ::com::sun::star::linguistic2;
 using namespace ::com::sun::star::i18n;
 
 
-void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
+void RestFlyInRange( SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
                       const SwNodeIndex* pInsertPos )
 {
     SwPosition aPos( rSttIdx );
     for( size_t n = 0; n < rArr.size(); ++n )
     {
         // create new anchor
-        _SaveFly& rSave = rArr[n];
+        SaveFly& rSave = rArr[n];
         SwFrameFormat* pFormat = rSave.pFrameFormat;
 
         if( rSave.bInsertPosition )
@@ -86,7 +86,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
     sw::CheckAnchoredFlyConsistency(*rSttIdx.GetNode().GetDoc());
 }
 
-void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
+void SaveFlyInRange( const SwNodeRange& rRg, SaveFlyArr& rArr )
 {
     SwFrameFormats& rFormats = *rRg.aStart.GetNode().GetDoc()->GetSpzFrameFormats();
     for( SwFrameFormats::size_type n = 0; n < rFormats.size(); ++n )
@@ -99,7 +99,7 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
              (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
             rRg.aStart <= pAPos->nNode && pAPos->nNode < rRg.aEnd )
         {
-            _SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
+            SaveFly aSave( pAPos->nNode.GetIndex() - rRg.aStart.GetIndex(),
                             pFormat, false );
             rArr.push_back( aSave );
             pFormat->DelFrames();
@@ -113,8 +113,8 @@ void _SaveFlyInRange( const SwNodeRange& rRg, _SaveFlyArr& rArr )
     sw::CheckAnchoredFlyConsistency(*rRg.aStart.GetNode().GetDoc());
 }
 
-void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
-                       _SaveFlyArr& rArr, bool bMoveAllFlys )
+void SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
+                       SaveFlyArr& rArr, bool bMoveAllFlys )
 {
     SwFrameFormats& rFormats = *rPam.GetPoint()->nNode.GetNode().GetDoc()->GetSpzFrameFormats();
     SwFrameFormat* pFormat;
@@ -165,7 +165,7 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
                         ( bInsPos = (rInsPos == pAPos->nNode) ))
 
             {
-                _SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(),
+                SaveFly aSave( pAPos->nNode.GetIndex() - rSttNdIdx.GetIndex(),
                                 pFormat, bInsPos );
                 rArr.push_back( aSave );
                 pFormat->DelFrames();
@@ -239,7 +239,7 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
 // because of unnecessary expanded redlines
 // From now on this class saves the redline positions of all redlines which ends exact at the
 // insert position (node _and_ content index)
-_SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt )
+SaveRedlEndPosForRestore::SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, sal_Int32 nCnt )
     : pSavArr( nullptr ), pSavIdx( nullptr ), nSavContent( nCnt )
 {
     SwNode& rNd = rInsIdx.GetNode();
@@ -265,13 +265,13 @@ _SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx
     }
 }
 
-_SaveRedlEndPosForRestore::~_SaveRedlEndPosForRestore()
+SaveRedlEndPosForRestore::~SaveRedlEndPosForRestore()
 {
     delete pSavArr;
     delete pSavIdx;
 }
 
-void _SaveRedlEndPosForRestore::_Restore()
+void SaveRedlEndPosForRestore::Restore_()
 {
     ++(*pSavIdx);
     SwContentNode* pNode = pSavIdx->GetNode().GetContentNode();
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 8f042a45ebef..0d141d29a06c 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -68,7 +68,7 @@ using namespace ::com::sun::star::uno;
 
 // the StartIndex can be supplied optionally (e.g. if it was queried before - is a virtual
 // method otherwise!)
-_SetGetExpField::_SetGetExpField(
+SetGetExpField::SetGetExpField(
     const SwNodeIndex& rNdIdx,
     const SwTextField* pField,
     const SwIndex* pIdx )
@@ -84,7 +84,7 @@ _SetGetExpField::_SetGetExpField(
         nContent = 0;
 }
 
-_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+SetGetExpField::SetGetExpField( const SwNodeIndex& rNdIdx,
                             const SwTextINetFormat& rINet, const SwIndex* pIdx )
 {
     eSetGetExpFieldType = TEXTINET;
@@ -99,7 +99,7 @@ _SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
 // Extension for Sections:
 // these always have content position 0xffffffff!
 // There is never a field on this, only up to COMPLETE_STRING possible
-_SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd,
+SetGetExpField::SetGetExpField( const SwSectionNode& rSectNd,
                                 const SwPosition* pPos )
 {
     eSetGetExpFieldType = SECTIONNODE;
@@ -117,7 +117,7 @@ _SetGetExpField::_SetGetExpField( const SwSectionNode& rSectNd,
     }
 }
 
-_SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos )
+SetGetExpField::SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPos )
 {
     eSetGetExpFieldType = TABLEBOX;
     CNTNT.pTBox = &rTBox;
@@ -141,7 +141,7 @@ _SetGetExpField::_SetGetExpField( const SwTableBox& rTBox, const SwPosition* pPo
     }
 }
 
-_SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
+SetGetExpField::SetGetExpField( const SwNodeIndex& rNdIdx,
                                 const SwTextTOXMark& rTOX,
                                 const SwIndex* pIdx )
 {
@@ -154,7 +154,7 @@ _SetGetExpField::_SetGetExpField( const SwNodeIndex& rNdIdx,
         nContent = rTOX.GetStart();
 }
 
-_SetGetExpField::_SetGetExpField( const SwPosition& rPos )
+SetGetExpField::SetGetExpField( const SwPosition& rPos )
 {
     eSetGetExpFieldType = CRSRPOS;
     CNTNT.pPos = &rPos;
@@ -162,7 +162,7 @@ _SetGetExpField::_SetGetExpField( const SwPosition& rPos )
     nContent = rPos.nContent.GetIndex();
 }
 
-_SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat,
+SetGetExpField::SetGetExpField( const SwFlyFrameFormat& rFlyFormat,
                                 const SwPosition* pPos  )
 {
     eSetGetExpFieldType = FLYFRAME;
@@ -180,7 +180,7 @@ _SetGetExpField::_SetGetExpField( const SwFlyFrameFormat& rFlyFormat,
     }
 }
 
-void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const
+void SetGetExpField::GetPosOfContent( SwPosition& rPos ) const
 {
     const SwNode* pNd = GetNodeFromContent();
     if( pNd )
@@ -198,7 +198,7 @@ void _SetGetExpField::GetPosOfContent( SwPosition& rPos ) const
     }
 }
 
-void _SetGetExpField::SetBodyPos( const SwContentFrame& rFrame )
+void SetGetExpField::SetBodyPos( const SwContentFrame& rFrame )
 {
     if( !rFrame.IsInDocBody() )
     {
@@ -213,7 +213,7 @@ void _SetGetExpField::SetBodyPos( const SwContentFrame& rFrame )
     }
 }
 
-bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const
+bool SetGetExpField::operator==( const SetGetExpField& rField ) const
 {
     return nNode == rField.nNode
            && nContent == rField.nContent
@@ -222,7 +222,7 @@ bool _SetGetExpField::operator==( const _SetGetExpField& rField ) const
                 || CNTNT.pTextField == rField.CNTNT.pTextField );
 }
 
-bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const
+bool SetGetExpField::operator<( const SetGetExpField& rField ) const
 {
     if( nNode < rField.nNode || ( nNode == rField.nNode && nContent < rField.nContent ))
         return true;
@@ -271,7 +271,7 @@ bool _SetGetExpField::operator<( const _SetGetExpField& rField ) const
     return GetCntPosFromContent() < rField.GetCntPosFromContent();
 }
 
-const SwNode* _SetGetExpField::GetNodeFromContent() const
+const SwNode* SetGetExpField::GetNodeFromContent() const
 {
     const SwNode* pRet = nullptr;
     if( CNTNT.pTextField )
@@ -315,7 +315,7 @@ const SwNode* _SetGetExpField::GetNodeFromContent() const
     return pRet;
 }
 
-sal_Int32 _SetGetExpField::GetCntPosFromContent() const
+sal_Int32 SetGetExpField::GetCntPosFromContent() const
 {
     sal_Int32 nRet = 0;
     if( CNTNT.pTextField )
@@ -337,8 +337,8 @@ sal_Int32 _SetGetExpField::GetCntPosFromContent() const
     return nRet;
 }
 
-_HashStr::_HashStr( const OUString& rName, const OUString& rText,
-                    _HashStr* pNxt )
+HashStr::HashStr( const OUString& rName, const OUString& rText,
+                    HashStr* pNxt )
     : SwHash( rName ), aSetStr( rText )
 {
     pNext = pNxt;
@@ -349,7 +349,7 @@ OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName )
 {
     SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize );
     if( pFnd )
-        return static_cast<_HashStr*>(pFnd)->aSetStr;
+        return static_cast<HashStr*>(pFnd)->aSetStr;
 
     return OUString();
 }
@@ -787,7 +787,7 @@ void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rFie
     {
         if( !bIns )             // if list is present and deleted
             return;             // don't do a thing
-        pFieldSortLst = new _SetGetExpFields;
+        pFieldSortLst = new SetGetExpFields;
     }
 
     if( bIns )      // insert anew:
@@ -796,7 +796,7 @@ void SwDocUpdateField::InsDelFieldInFieldLst( bool bIns, const SwTextField& rFie
     {
         // look up via the pTextField pointer. It is a sorted list, but it's sorted by node
         // position. Until this is found, the search for the pointer is already done.
-        for( _SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n )
+        for( SetGetExpFields::size_type n = 0; n < pFieldSortLst->size(); ++n )
             if( &rField == (*pFieldSortLst)[ n ]->GetPointer() )
             {
                 delete (*pFieldSortLst)[n];
@@ -810,14 +810,14 @@ void SwDocUpdateField::MakeFieldList( SwDoc& rDoc, bool bAll, int eGetMode )
 {
     if( !pFieldSortLst || bAll || !( eGetMode & nFieldLstGetMode ) ||
         rDoc.GetNodes().Count() != nNodes )
-        _MakeFieldList( rDoc, eGetMode );
+        MakeFieldList_( rDoc, eGetMode );
 }
 
-void SwDocUpdateField::_MakeFieldList( SwDoc& rDoc, int eGetMode )
+void SwDocUpdateField::MakeFieldList_( SwDoc& rDoc, int eGetMode )
 {
     // new version: walk all fields of the attribute pool
     delete pFieldSortLst;
-    pFieldSortLst = new _SetGetExpFields;
+    pFieldSortLst = new SetGetExpFields;
 
     // consider and unhide sections
     //     with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>)
@@ -1007,7 +1007,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel
     Point aPt;
     const SwContentFrame* pFrame = rTextNd.getLayoutFrame( rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, nullptr, false );
 
-    _SetGetExpField* pNew = nullptr;
+    SetGetExpField* pNew = nullptr;
     bool bIsInBody = false;
 
     if( !pFrame || pFrame->IsInDocBody() )
@@ -1021,7 +1021,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel
         // fields in hidden sections. So: In order to be updated, a field 1)
         // must have a frame, or 2) it must be in the document body.
         if( (pFrame != nullptr) || bIsInBody )
-            pNew = new _SetGetExpField( aIdx, &rTField );
+            pNew = new SetGetExpField( aIdx, &rTField );
     }
     else
     {
@@ -1030,7 +1030,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel
         bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame );
         OSL_ENSURE(bResult, "where is the Field");
         (void) bResult; // unused in non-debug
-        pNew = new _SetGetExpField( aPos.nNode, &rTField, &aPos.nContent );
+        pNew = new SetGetExpField( aPos.nNode, &rTField, &aPos.nContent );
     }
 
     // always set the BodyTextFlag in GetExp or DB fields
@@ -1054,7 +1054,7 @@ void SwDocUpdateField::GetBodyNode( const SwTextField& rTField, sal_uInt16 nFiel
 void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd )
 {
     const SwDoc& rDoc = *rSectNd.GetDoc();
-    _SetGetExpField* pNew = nullptr;
+    SetGetExpField* pNew = nullptr;
 
     if( rSectNd.GetIndex() < rDoc.GetNodes().GetEndOfExtras().GetIndex() )
     {
@@ -1077,13 +1077,13 @@ void SwDocUpdateField::GetBodyNode( const SwSectionNode& rSectNd )
             bool const bResult = GetBodyTextNode( rDoc, aPos, *pFrame );
             OSL_ENSURE(bResult, "where is the Field");
             (void) bResult; // unused in non-debug
-            pNew = new _SetGetExpField( rSectNd, &aPos );
+            pNew = new SetGetExpField( rSectNd, &aPos );
 
         } while( false );
     }
 
     if( !pNew )
-        pNew = new _SetGetExpField( rSectNd );
+        pNew = new SetGetExpField( rSectNd );
 
     if( !pFieldSortLst->insert( pNew ).second )
         delete pNew;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 08c3fcbce6e8..88518874a544 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -839,7 +839,7 @@ SwFrameFormat *SwDoc::MakeFrameFormat(const OUString &rFormatName,
     return pFormat;
 }
 
-SwFormat *SwDoc::_MakeFrameFormat(const OUString &rFormatName,
+SwFormat *SwDoc::MakeFrameFormat_(const OUString &rFormatName,
                             SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -875,7 +875,7 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
     return pFormat;
 }
 
-SwFormat *SwDoc::_MakeCharFormat(const OUString &rFormatName,
+SwFormat *SwDoc::MakeCharFormat_(const OUString &rFormatName,
                             SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -910,7 +910,7 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
     return pFormatColl;
 }
 
-SwFormat *SwDoc::_MakeTextFormatColl(const OUString &rFormatName,
+SwFormat *SwDoc::MakeTextFormatColl_(const OUString &rFormatName,
                             SwFormat *pDerivedFrom,
                             bool bBroadcast, bool bAuto)
 {
@@ -1147,7 +1147,7 @@ SwFormat* SwDoc::CopyFormat( const SwFormat& rFormat,
 /// copy the frame format
 SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat )
 {
-    return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::_MakeFrameFormat,
+    return static_cast<SwFrameFormat*>(CopyFormat( rFormat, *GetFrameFormats(), &SwDoc::MakeFrameFormat_,
                                 *GetDfltFrameFormat() ));
 }
 
@@ -1155,7 +1155,7 @@ SwFrameFormat* SwDoc::CopyFrameFormat( const SwFrameFormat& rFormat )
 SwCharFormat* SwDoc::CopyCharFormat( const SwCharFormat& rFormat )
 {
     return static_cast<SwCharFormat*>(CopyFormat( rFormat, *GetCharFormats(),
-                                            &SwDoc::_MakeCharFormat,
+                                            &SwDoc::MakeCharFormat_,
                                             *GetDfltCharFormat() ));
 }
 
@@ -1383,7 +1383,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
                 const SwNode& rCSttNd = pContent->GetContentIdx()->GetNode();
                 SwNodeRange aRg( rCSttNd, 0, *rCSttNd.EndOfSectionNode() );
                 aTmpIdx = *pSttNd->EndOfSectionNode();
-                rSrcNds._Copy( aRg, aTmpIdx );
+                rSrcNds.Copy_( aRg, aTmpIdx );
                 aTmpIdx = *pSttNd;
                 rSrcFormat.GetDoc()->GetDocumentContentOperationsManager().CopyFlyInFlyImpl( aRg, 0, aTmpIdx );
                 pNewFormat->SetFormatAttr( SwFormatContent( pSttNd ));
@@ -1526,11 +1526,11 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
     ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
     CopyFormatArr( *rSource.mpCharFormatTable, *mpCharFormatTable,
-                &SwDoc::_MakeCharFormat, *mpDfltCharFormat );
+                &SwDoc::MakeCharFormat_, *mpDfltCharFormat );
     CopyFormatArr( *rSource.mpFrameFormatTable, *mpFrameFormatTable,
-                &SwDoc::_MakeFrameFormat, *mpDfltFrameFormat );
+                &SwDoc::MakeFrameFormat_, *mpDfltFrameFormat );
     CopyFormatArr( *rSource.mpTextFormatCollTable, *mpTextFormatCollTable,
-                &SwDoc::_MakeTextFormatColl, *mpDfltTextFormatColl );
+                &SwDoc::MakeTextFormatColl_, *mpDfltTextFormatColl );
 
     //To-Do:
     //  a) in rtf export don't export our hideous pgdsctbl
@@ -1710,7 +1710,7 @@ SwTableLineFormat* SwDoc::MakeTableLineFormat()
     return pFormat;
 }
 
-void SwDoc::_CreateNumberFormatter()
+void SwDoc::CreateNumberFormatter()
 {
     OSL_ENSURE( !mpNumberFormatter, "is already there" );
 
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 6e3c911e0742..edc1aaf8e300 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -302,7 +302,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
 
                     SwNodeRange aRg( *pStartNd, 0, aEndIdx.GetNode() );
                     SwNodeIndex aTmpIdx( pDoc->GetNodes().GetEndOfContent() );
-                    GetNodes()._Copy( aRg, aTmpIdx, false );
+                    GetNodes().Copy_( aRg, aTmpIdx, false );
 
                     // Delete the initial TextNode
                     SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 2 );
@@ -437,7 +437,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                             {
                                 SwNodeRange aRg( *pStartNd, *pSectEnd );
                                 SwNodeIndex aIdx( *pSectEnd, 1 );
-                                GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
+                                GetNodes().MoveNodes( aRg, GetNodes(), aIdx );
                             }
                             pSectNd = pStartNd->FindSectionNode();
                         }
@@ -452,7 +452,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
                             {
                                 SwNodeRange aRg( *pSectNd, 1, aEndIdx, 1 );
                                 SwNodeIndex aIdx( *pSectNd );
-                                GetNodes()._MoveNodes( aRg, GetNodes(), aIdx );
+                                GetNodes().MoveNodes( aRg, GetNodes(), aIdx );
                             }
 
                             pSectNd = pStartNd->FindSectionNode();
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 6a870069d1fa..d22aa01a2b7b 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -168,7 +168,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
                     pContentNd, (pContentNd) ? pContentNd->Len() : 0 );
 
             GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, nullptr );
-            SwPaM *_pStartCursor = &rPaM, *__pStartCursor = _pStartCursor;
+            SwPaM *_pStartCursor = &rPaM, *_pStartCursor2 = _pStartCursor;
             do {
 
                 SwPosition& rInsPos = *_pStartCursor->GetPoint();
@@ -193,7 +193,7 @@ bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
                 if( pShell )
                     pShell->SaveTableBoxContent( &rInsPos );
             } while( (_pStartCursor = static_cast<SwPaM *>(_pStartCursor->GetNext())) !=
-                        __pStartCursor );
+                        _pStartCursor2 );
             GetIDocumentUndoRedo().EndUndo( UNDO_INSGLOSSARY, nullptr );
 
             getIDocumentFieldsAccess().UnlockExpFields();
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index cad5f2c2cc45..e1109c52e042 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -161,7 +161,7 @@ SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc,
     return pObj;
 }
 
-SwFlyFrameFormat* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
+SwFlyFrameFormat* SwDoc::MakeFlySection_( const SwPosition& rAnchPos,
                                     const SwContentNode& rNode,
                                     RndStdIds eRequestId,
                                     const SfxItemSet* pFlySet,
@@ -341,7 +341,7 @@ SwFlyFrameFormat* SwDoc::MakeFlySection( RndStdIds eAnchorType,
             static_cast<SwContentNode *>(pNewTextNd)->SetAttr(*pItem);
         }
 
-         pFormat = _MakeFlySection( *pAnchorPos, *pNewTextNd,
+         pFormat = MakeFlySection_( *pAnchorPos, *pNewTextNd,
                                 eAnchorType, pFlySet, pFrameFormat );
     }
     return pFormat;
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index aca03fb1f769..a136c3576b4a 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -322,7 +322,7 @@ SwDoc::SwDoc()
     // Set BodyFormat for columns
     mpColumnContFormat->SetFormatAttr( SwFormatFillOrder( ATT_LEFT_TO_RIGHT ) );
 
-    GetDocumentFieldsManager()._InitFieldTypes();
+    GetDocumentFieldsManager().InitFieldTypes();
 
     // Create a default OutlineNumRule (for Filters)
     mpOutlineRule = new SwNumRule( SwNumRule::GetOutlineRuleName(),
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5d6550450586..eb955f673b14 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1197,7 +1197,7 @@ void SwRangeRedline::CopyToSection()
 
         // The IsRedlineMove() flag causes the behaviour of the
         // SwDoc::_CopyFlyInFly method to change, which will eventually be
-        // called by the pDoc->Copy line below (through SwDoc::_Copy,
+        // called by the pDoc->Copy line below (through SwDoc::Copy_,
         // SwDoc::CopyWithFlyInFly). This rather obscure bugfix
         // apparently never really worked.
         pDoc->getIDocumentRedlineAccess().SetRedlineMove( pStt->nContent == 0 );
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 1fc9a2a80309..d92ee5c36149 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -49,7 +49,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                             sal_uInt16 nMode )
 {
     const SwPaM *_pStartCursor = rPam.GetNext(),
-                *__pStartCursor = _pStartCursor;
+                *_pStartCursor2 = _pStartCursor;
     bool bCheckEmpty = &rPam != _pStartCursor;
     do {
         const SwPosition* pStt = _pStartCursor->Start(),
@@ -66,7 +66,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                     aPam.SetMark();
                     *aPam.GetMark() = *pEnd;
                 }
-                if( _SelectNextRubyChars( aPam, *pNew, nMode ))
+                if( SelectNextRubyChars( aPam, *pNew, nMode ))
                 {
                     rList.push_back(std::move(pNew));
                     aPam.DeleteMark();
@@ -85,7 +85,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
             } while( 30 > rList.size() && *aPam.GetPoint() < *pEnd );
         }
     } while( 30 > rList.size() &&
-        (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor );
+        (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 );
 
     return rList.size();
 }
@@ -100,7 +100,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
     sal_uInt16 nListEntry = 0;
 
     const SwPaM *_pStartCursor = rPam.GetNext(),
-                *__pStartCursor = _pStartCursor;
+                *_pStartCursor2 = _pStartCursor;
     bool bCheckEmpty = &rPam != _pStartCursor;
     do {
         const SwPosition* pStt = _pStartCursor->Start(),
@@ -118,7 +118,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
                     aPam.SetMark();
                     *aPam.GetMark() = *pEnd;
                 }
-                if( _SelectNextRubyChars( aPam, aCheckEntry, nMode ))
+                if( SelectNextRubyChars( aPam, aCheckEntry, nMode ))
                 {
                     const SwRubyListEntry* pEntry = rList[ nListEntry++ ].get();
                     if( aCheckEntry.GetRubyAttr() != pEntry->GetRubyAttr() )
@@ -172,12 +172,12 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
             } while( nListEntry < rList.size() && *aPam.GetPoint() < *pEnd );
         }
     } while( 30 > rList.size() &&
-        (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor );
+        (_pStartCursor = _pStartCursor->GetNext()) != _pStartCursor2 );
 
     GetIDocumentUndoRedo().EndUndo( UNDO_SETRUBYATTR, nullptr );
 }
 
-bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
+bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
 {
     // Point must be the startposition, Mark is optional the end position
     SwPosition* pPos = rPam.GetPoint();
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 9a2f762361bf..220e3cb90b18 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -242,7 +242,7 @@ SwSortBoxElement::~SwSortBoxElement()
 /// Get Key for a cell
 OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const
 {
-    const _FndBox* pFndBox;
+    const FndBox_* pFndBox;
     sal_uInt16 nCol = pOptions->aKeys[nKey]->nColumnId-1;
 
     if( SRT_ROWS == pOptions->eDirection )
@@ -271,7 +271,7 @@ OUString SwSortBoxElement::GetKey(sal_uInt16 nKey) const
 
 double SwSortBoxElement::GetValue( sal_uInt16 nKey ) const
 {
-    const _FndBox* pFndBox;
+    const FndBox_* pFndBox;
     sal_uInt16 nCol = pOptions->aKeys[nKey]->nColumnId-1;
 
     if( SRT_ROWS == pOptions->eDirection )
@@ -349,7 +349,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
             // First copy the range
             SwNodeIndex aEndIdx( pEnd->nNode, 1 );
             SwNodeRange aRg( pStart->nNode, aEndIdx );
-            GetNodes()._Copy( aRg, aEndIdx );
+            GetNodes().Copy_( aRg, aEndIdx );
 
             // range is new from pEnd->nNode+1 to aEndIdx
             getIDocumentRedlineAccess().DeleteRedline( *pRedlPam, true, USHRT_MAX );
@@ -490,9 +490,9 @@ bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
 
     // We begin sorting
     // Find all Boxes/Lines
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {
-        _FndPara aPara( rBoxes, &aFndBox );
+        FndPara aPara( rBoxes, &aFndBox );
         ForEach_FndLineCopyCol( pTableNd->GetTable().GetTabLines(), &aPara );
     }
 
@@ -611,10 +611,10 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 {
     for( sal_uInt16 i=0; i < rBox.GetCols(); ++i )
     {   // Get old cell position and remember it
-        const _FndBox* pSource = rBox.GetBox(i, nS);
+        const FndBox_* pSource = rBox.GetBox(i, nS);
 
         // new cell position
-        const _FndBox* pTarget = rBox.GetBox(i, nT);
+        const FndBox_* pTarget = rBox.GetBox(i, nT);
 
         const SwTableBox* pT = pTarget->GetBox();
         const SwTableBox* pS = pSource->GetBox();
@@ -655,10 +655,10 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, sal_uInt16 nS, sal_uInt16 nT,
 {
     for(sal_uInt16 i=0; i < rBox.GetRows(); ++i)
     {   // Get old cell position and remember it
-        const _FndBox* pSource = rBox.GetBox(nS, i);
+        const FndBox_* pSource = rBox.GetBox(nS, i);
 
         // new cell position
-        const _FndBox* pTarget = rBox.GetBox(nT, i);
+        const FndBox_* pTarget = rBox.GetBox(nT, i);
 
         // and move it
         const SwTableBox* pT = pTarget->GetBox();
@@ -747,7 +747,7 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
 }
 
 /// Generate two-dimensional array of FndBoxes
-FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
+FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) :
     pDoc(pDocPtr),
     rBoxRef(rBox),
     pArr(nullptr),
@@ -763,9 +763,9 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
 
         // Create linear array
         size_t nCount = static_cast<size_t>(nRows) * nCols;
-        pArr = new const _FndBox*[nCount];
-        _FndBox** ppTmp = const_cast<_FndBox**>(pArr);
-        memset(ppTmp, 0, sizeof(const _FndBox*) * nCount);
+        pArr = new const FndBox_*[nCount];
+        FndBox_** ppTmp = const_cast<FndBox_**>(pArr);
+        memset(ppTmp, 0, sizeof(const FndBox_*) * nCount);
 
         FillFlat( rBoxRef );
     }
@@ -773,7 +773,7 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
 
 FlatFndBox::~FlatFndBox()
 {
-    _FndBox** ppTmp = const_cast<_FndBox**>(pArr);
+    FndBox_** ppTmp = const_cast<FndBox_**>(pArr);
     delete [] ppTmp;
 
     if( ppItemSets )
@@ -781,14 +781,14 @@ FlatFndBox::~FlatFndBox()
 }
 
 /// All Lines of a Box need to have same number of Boxes
-bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
+bool FlatFndBox::CheckLineSymmetry(const FndBox_& rBox)
 {
     const FndLines_t &rLines = rBox.GetLines();
     FndBoxes_t::size_type nBoxes {0};
 
     for (FndLines_t::size_type i=0; i < rLines.size(); ++i)
     {
-        const _FndLine* pLn = rLines[i].get();
+        const FndLine_* pLn = rLines[i].get();
         const FndBoxes_t& rBoxes = pLn->GetBoxes();
 
         // Number of Boxes of all Lines is unequal -> no symmetry
@@ -803,14 +803,14 @@ bool FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
 }
 
 /// Check Box for symmetry (All Boxes of a Line need to have same number of Lines)
-bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
+bool FlatFndBox::CheckBoxSymmetry(const FndLine_& rLn)
 {
     const FndBoxes_t &rBoxes = rLn.GetBoxes();
     FndLines_t::size_type nLines {0};
 
     for (FndBoxes_t::size_type i = 0; i < rBoxes.size(); ++i)
     {
-        _FndBox const*const pBox = rBoxes[i].get();
+        FndBox_ const*const pBox = rBoxes[i].get();
         const FndLines_t& rLines = pBox->GetLines();
 
         // Number of Lines of all Boxes is unequal -> no symmetry
@@ -825,7 +825,7 @@ bool FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
 }
 
 /// Maximum count of Columns (Boxes)
-sal_uInt16 FlatFndBox::GetColCount(const _FndBox& rBox)
+sal_uInt16 FlatFndBox::GetColCount(const FndBox_& rBox)
 {
     const FndLines_t& rLines = rBox.GetLines();
     // Iterate over Lines
@@ -850,7 +850,7 @@ sal_uInt16 FlatFndBox::GetColCount(const _FndBox& rBox)
 }
 
 /// Maximum count of Rows (Lines)
-sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox)
+sal_uInt16 FlatFndBox::GetRowCount(const FndBox_& rBox)
 {
     const FndLines_t& rLines = rBox.GetLines();
     if( rLines.empty() )
@@ -875,7 +875,7 @@ sal_uInt16 FlatFndBox::GetRowCount(const _FndBox& rBox)
 }
 
 /// Create a linear array of atomic FndBoxes
-void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
+void FlatFndBox::FillFlat(const FndBox_& rBox, bool bLastBox)
 {
     bool bModRow = false;
     const FndLines_t& rLines = rBox.GetLines();
@@ -890,7 +890,7 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
         for( FndBoxes_t::size_type j = 0; j < rBoxes.size(); ++j )
         {
             // Check the Box if it's an atomic one
-            const _FndBox *const pBox = rBoxes[j].get();
+            const FndBox_ *const pBox = rBoxes[j].get();
 
             if( pBox->GetLines().empty() )
             {
@@ -935,10 +935,10 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, bool bLastBox)
 }
 
 /// Access a specific Cell
-const _FndBox* FlatFndBox::GetBox(sal_uInt16 n_Col, sal_uInt16 n_Row) const
+const FndBox_* FlatFndBox::GetBox(sal_uInt16 n_Col, sal_uInt16 n_Row) const
 {
     sal_uInt16 nOff = n_Row * nCols + n_Col;
-    const _FndBox* pTmp = *(pArr + nOff);
+    const FndBox_* pTmp = *(pArr + nOff);
 
     OSL_ENSURE(n_Col < nCols && n_Row < nRows && pTmp, "invalid array access");
     return pTmp;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index ae2fda623a03..0cc41d437305 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1330,10 +1330,10 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
 
 static long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
 {
-    static struct _SoObjType {
+    static struct SoObjType {
         long nFlag;
         // GlobalNameId
-        struct _GlobalNameIds {
+        struct GlobalNameIds {
             sal_uInt32 n1;
             sal_uInt16 n2, n3;
             sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15;
@@ -1358,10 +1358,10 @@ static long lcl_IsSOObject( const SvGlobalName& rFactoryNm )
     };
 
     long nRet = 0;
-    for( const _SoObjType* pArr = aArr; !nRet && pArr->nFlag; ++pArr )
+    for( const SoObjType* pArr = aArr; !nRet && pArr->nFlag; ++pArr )
         for ( int n = 0; n < 4; ++n )
         {
-            const _SoObjType::_GlobalNameIds& rId = pArr->aGlNmIds[ n ];
+            const SoObjType::GlobalNameIds& rId = pArr->aGlNmIds[ n ];
             if( !rId.n1 )
                 break;
             SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3,
@@ -1625,7 +1625,7 @@ void SwTOXBaseSection::UpdatePageNum()
                 const SwTextNode* pTextNd = pBase->pTOXNd->GetTextNode();
                 OSL_ENSURE( pTextNd, "no TextNode, wrong TOC" );
 
-                _UpdatePageNum( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums,
+                UpdatePageNum_( const_cast<SwTextNode*>(pTextNd), aNums, aDescs, pMainNums,
                                 aIntl );
             }
             DELETEZ(pMainNums);
@@ -1651,7 +1651,7 @@ static bool lcl_HasMainEntry( const std::vector<sal_uInt16>* pMainEntryNums, sal
     return false;
 }
 
-void SwTOXBaseSection::_UpdatePageNum( SwTextNode* pNd,
+void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
                                     const std::vector<sal_uInt16>& rNums,
                                     const std::vector<SwPageDesc*>& rDescs,
                                     const std::vector<sal_uInt16>* pMainEntryNums,
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 3e73206b0099..aeab4b21521a 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -30,7 +30,7 @@ inline const SvxBorderLine* GetLineTB( const SvxBoxItem* pBox, bool bTop )
     return bTop ? pBox->GetTop() : pBox->GetBottom();
 }
 
-bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat )
+bool SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat )
 {
     const SvxBorderLine* pBrd;
     const SfxPoolItem* pItem;
@@ -44,15 +44,15 @@ bool _SwGCBorder_BoxBrd::CheckLeftBorderOfFormat( const SwFrameFormat& rFormat )
     return false;
 }
 
-static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd* pPara );
+static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, SwGCBorder_BoxBrd* pPara );
 
-static bool lcl_GCBorder_ChkBoxBrd_L( const SwTableLine* pLine, _SwGCBorder_BoxBrd* pPara )
+static bool lcl_GCBorder_ChkBoxBrd_L( const SwTableLine* pLine, SwGCBorder_BoxBrd* pPara )
 {
     const SwTableBox* pBox = pLine->GetTabBoxes().front();
     return lcl_GCBorder_ChkBoxBrd_B( pBox, pPara );
 }
 
-static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, _SwGCBorder_BoxBrd* pPara )
+static bool lcl_GCBorder_ChkBoxBrd_B( const SwTableBox* pBox, SwGCBorder_BoxBrd* pPara )
 {
     if( !pBox->GetTabLines().empty() )
     {
@@ -157,13 +157,13 @@ static void lcl_GCBorder_DelBorder( const SwCollectTableLineBoxes& rCollTLB,
     } while( true );
 }
 
-static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara );
+static void lcl_GC_Box_Border( const SwTableBox* pBox, SwGCLineBorder* pPara );
 
-void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
+void sw_GC_Line_Border( const SwTableLine* pLine, SwGCLineBorder* pGCPara )
 {
     // First the right edge with the left edge of the succeeding Box within this Line
     {
-        _SwGCBorder_BoxBrd aBPara;
+        SwGCBorder_BoxBrd aBPara;
         const SvxBorderLine* pBrd;
         const SfxPoolItem* pItem;
         const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -308,35 +308,35 @@ void sw_GC_Line_Border( const SwTableLine* pLine, _SwGCLineBorder* pGCPara )
     ++pGCPara->nLinePos;
 }
 
-static void lcl_GC_Box_Border( const SwTableBox* pBox, _SwGCLineBorder* pPara )
+static void lcl_GC_Box_Border( const SwTableBox* pBox, SwGCLineBorder* pPara )
 {
     if( !pBox->GetTabLines().empty() )
     {
-        _SwGCLineBorder aPara( *pBox );
+        SwGCLineBorder aPara( *pBox );
         aPara.pShareFormats = pPara->pShareFormats;
         for( const SwTableLine* pLine : pBox->GetTabLines() )
             sw_GC_Line_Border( pLine, &aPara );
     }
 }
 
-struct _GCLinePara
+struct GCLinePara
 {
     SwTableLines* pLns;
     SwShareBoxFormats* pShareFormats;
 
-    _GCLinePara( SwTableLines& rLns, _GCLinePara* pPara = nullptr )
+    GCLinePara( SwTableLines& rLns, GCLinePara* pPara = nullptr )
         : pLns( &rLns ), pShareFormats( pPara ? pPara->pShareFormats : nullptr )
     {}
 };
 
-static bool lcl_MergeGCLine(SwTableLine* pLine, _GCLinePara* pPara);
+static bool lcl_MergeGCLine(SwTableLine* pLine, GCLinePara* pPara);
 
-static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara)
+static bool lcl_MergeGCBox(SwTableBox* pTableBox, GCLinePara* pPara)
 {
     if( !pTableBox->GetTabLines().empty() )
     {
         // ATTENTION: The Line count can change!
-        _GCLinePara aPara( pTableBox->GetTabLines(), pPara );
+        GCLinePara aPara( pTableBox->GetTabLines(), pPara );
         for( SwTableLines::size_type n = 0;
             n < pTableBox->GetTabLines().size() && lcl_MergeGCLine( pTableBox->GetTabLines()[n], &aPara );
             ++n )
@@ -365,7 +365,7 @@ static bool lcl_MergeGCBox(SwTableBox* pTableBox, _GCLinePara* pPara)
     return true;
 }
 
-static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara)
+static bool lcl_MergeGCLine(SwTableLine* pLn, GCLinePara* pGCPara)
 {
     SwTableBoxes::size_type nBoxes = pLn->GetTabBoxes().size();
     if( nBoxes )
@@ -430,7 +430,7 @@ static bool lcl_MergeGCLine(SwTableLine* pLn, _GCLinePara* pGCPara)
 void SwTable::GCLines()
 {
     // ATTENTION: The Line count can change!
-    _GCLinePara aPara( GetTabLines() );
+    GCLinePara aPara( GetTabLines() );
     SwShareBoxFormats aShareFormats;
     aPara.pShareFormats = &aShareFormats;
     for( SwTableLines::size_type n = 0; n < GetTabLines().size() &&
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 89e618e802a0..3fce21e7d42d 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1100,7 +1100,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
 
     // Remember the available width for which the table was calculated.
     // This is a good place as we pass by here for the initial calculation
-    // of the table in the parser and for each _Resize call.
+    // of the table in the parser and for each Resize_ call.
     m_nLastResizeAbsAvail = nAbsAvail;
 
     // Step 1: The available space is readjusted for the left/right border,
@@ -1702,7 +1702,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
             const SwTableLines& rLines = m_pSwTable->GetTabLines();
             for (size_t n = 0; n < rLines.size(); ++n)
             {
-                _CheckBoxWidth( *rLines[ n ], nSize );
+                CheckBoxWidth( *rLines[ n ], nSize );
             }
         }
 #endif
@@ -1723,7 +1723,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail,
     }
 }
 
-void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc )
+void SwHTMLTableLayout::Resize_( sal_uInt16 nAbsAvail, bool bRecalc )
 {
     // If bRecalc is set, the table's content changed.
     // We need to execute pass 1 again.
@@ -1744,7 +1744,7 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc )
 IMPL_LINK_NOARG_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void )
 {
     m_aResizeTimer.Stop();
-    _Resize( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc );
+    Resize_( m_nDelayedResizeAbsAvail, m_bDelayedResizeRecalc );
 }
 
 bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
@@ -1800,7 +1800,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
     {
         if( m_aResizeTimer.IsActive() )
             m_aResizeTimer.Stop();
-        _Resize( nAbsAvail, bRecalc );
+        Resize_( nAbsAvail, bRecalc );
     }
     else if( nDelay > 0 )
     {
@@ -1811,7 +1811,7 @@ bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc,
     }
     else
     {
-        _Resize( nAbsAvail, bRecalc );
+        Resize_( nAbsAvail, bRecalc );
     }
 
     return true;
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 86a555eeac2b..3aa513caeddf 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -284,7 +284,7 @@ void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec
             aGrfArea = SwRect( Frame().Pos( ), pFly->GetUnclippedFrame( ).SSize( ) );
     }
 
-    aPaintArea._Intersection( aOrigPaint );
+    aPaintArea.Intersection_( aOrigPaint );
 
     SwRect aNormal( Frame().Pos() + Prt().Pos(), Prt().SSize() );
     aNormal.Justify(); // Normalized rectangle for the comparisons
@@ -296,7 +296,7 @@ void SwNoTextFrame::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRec
             ::lcl_ClearArea( *this, rRenderContext, aPaintArea, aNormal );
 
         // The intersection of the PaintArea and the Bitmap contains the absolutely visible area of the Frame
-        aPaintArea._Intersection( aNormal );
+        aPaintArea.Intersection_( aNormal );
 
         if ( bClip )
             rRenderContext.IntersectClipRegion( aPaintArea.SVRect() );
@@ -521,7 +521,7 @@ bool SwNoTextFrame::GetCharRect( SwRect &rRect, const SwPosition& rPos,
         rRect.Width( 1 );
     }
     else
-        rRect._Intersection( aFrameRect );
+        rRect.Intersection_( aFrameRect );
 
     if ( pCMS )
     {
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 685f2e58861a..41e44f137175 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -93,7 +93,7 @@ namespace
                      BoxStructure::iterator& rpSel, bool &rbSel, bool bCover );
         void incColSpan( sal_uInt16 nLine, sal_uInt16 nCol );
         explicit TableStructure( const SwTable& rTable );
-        TableStructure( const SwTable& rTable, _FndBox &rFndBox,
+        TableStructure( const SwTable& rTable, FndBox_ &rFndBox,
                         const SwSelBoxes& rSelBoxes,
                         LineStructure::size_type nMinSize );
         LineStructure::size_type getLineCount() const
@@ -180,7 +180,7 @@ namespace
     }
 
     TableStructure::TableStructure( const SwTable& rTable,
-        _FndBox &rFndBox, const SwSelBoxes& rSelBoxes,
+        FndBox_ &rFndBox, const SwSelBoxes& rSelBoxes,
         LineStructure::size_type nMinSize )
         : mnStartCol(USHRT_MAX), mnAddLine(0)
     {
@@ -213,9 +213,9 @@ namespace
                     {
                         SwTableLine *pLine2 = rLines[ ++nEndLn ];
                         SwTableBox *pTmpBox = pLine2->GetTabBoxes()[0];
-                        _FndLine *pInsLine = new _FndLine( pLine2, &rFndBox );
-                        pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(), o3tl::make_unique<_FndBox>(pTmpBox, pInsLine));
-                        rFndLines.push_back(std::unique_ptr<_FndLine>(pInsLine));
+                        FndLine_ *pInsLine = new FndLine_( pLine2, &rFndBox );
+                        pInsLine->GetBoxes().insert(pInsLine->GetBoxes().begin(), o3tl::make_unique<FndBox_>(pTmpBox, pInsLine));
+                        rFndLines.push_back(std::unique_ptr<FndLine_>(pInsLine));
                     }
                 }
                 maLines.resize( nEndLn - nStartLn + 1 );
@@ -666,9 +666,9 @@ bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes
     TableStructure aCopyStruct( rCpyTable );
 
     // Analyze target structure (from start box) and selected substructure
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {   // get all boxes/lines
-        _FndPara aPara( rSelBoxes, &aFndBox );
+        FndPara aPara( rSelBoxes, &aFndBox );
         ForEach_FndLineCopyCol( GetTabLines(), &aPara );
     }
     TableStructure aTarget( *this, aFndBox, rSelBoxes, aCopyStruct.getLineCount() );
@@ -735,7 +735,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwNodeIndex& rSttBox,
     OSL_ENSURE( pMyBox, "Index is not in a Box in this Table" );
 
     // First delete the Table's Frames
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     aFndBox.DelFrames( pTableNd->GetTable() );
 
     SwDoc* pCpyDoc = rCpyTable.GetFrameFormat()->GetDoc();
@@ -815,11 +815,11 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
 
     SwTableNumFormatMerge aTNFM( *pCpyDoc, *pDoc );
 
-    _FndLine *pFLine, *pInsFLine = nullptr;
-    _FndBox aFndBox( nullptr, nullptr );
+    FndLine_ *pFLine, *pInsFLine = nullptr;
+    FndBox_ aFndBox( nullptr, nullptr );
     // Find all Boxes/Lines
     {
-        _FndPara aPara( rSelBoxes, &aFndBox );
+        FndPara aPara( rSelBoxes, &aFndBox );
         ForEach_FndLineCopyCol( GetTabLines(), &aPara );
     }
 
@@ -827,7 +827,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
     // Boxes!
     if( 1 != rCpyTable.GetTabSortBoxes().size() )
     {
-        _FndBox* pFndBox;
+        FndBox_* pFndBox;
 
         const FndLines_t::size_type nFndCnt = aFndBox.GetLines().size();
         if( !nFndCnt )
@@ -905,7 +905,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
             if( nLn >= nFndCnt )
             {
                 // We have more rows in the ClipBoard than we have selected
-                pInsFLine = new _FndLine( GetTabLines()[ nSttLine + nLn ],
+                pInsFLine = new FndLine_( GetTabLines()[ nSttLine + nLn ],
                                         &aFndBox );
                 pLine = pInsFLine->GetLine();
             }
@@ -933,11 +933,11 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
                         return false;
                     }
                     // if Ok, insert the Box into the FndLine
-                    pFndBox = new _FndBox( pTmpBox, pInsFLine );
+                    pFndBox = new FndBox_( pTmpBox, pInsFLine );
                     pInsFLine->GetBoxes().insert( pInsFLine->GetBoxes().begin() + nBx,
-                            std::unique_ptr<_FndBox>(pFndBox));
+                            std::unique_ptr<FndBox_>(pFndBox));
                 }
-                aFndBox.GetLines().insert( aFndBox.GetLines().begin() + nLn, std::unique_ptr<_FndLine>(pInsFLine));
+                aFndBox.GetLines().insert( aFndBox.GetLines().begin() + nLn, std::unique_ptr<FndLine_>(pInsFLine));
             }
             else if( pFLine->GetBoxes().size() == 1 )
             {
@@ -955,9 +955,9 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
                     // if Ok, insert the Box into the FndLine
                     if( nBx == pFLine->GetBoxes().size() )
                     {
-                        pFndBox = new _FndBox( pTmpBox, pFLine );
+                        pFndBox = new FndBox_( pTmpBox, pFLine );
                         pFLine->GetBoxes().insert(pFLine->GetBoxes().begin() + nBx,
-                                std::unique_ptr<_FndBox>(pFndBox));
+                                std::unique_ptr<FndBox_>(pFndBox));
                     }
                 }
             }
@@ -1022,23 +1022,23 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
     return true;
 }
 
-static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara );
+static void FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara );
 
-static void _FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara )
+static void FndContentBox( const SwTableBox* pBox, SwSelBoxes* pPara )
 {
     if( !pBox->GetTabLines().empty() )
     {
         for( const SwTableLine* pLine : pBox->GetTabLines() )
-            _FndContentLine( pLine, pPara );
+            FndContentLine( pLine, pPara );
     }
     else
         pPara->insert( const_cast<SwTableBox*>(pBox) );
 }
 
-static void _FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara )
+static void FndContentLine( const SwTableLine* pLine, SwSelBoxes* pPara )
 {
     for( const SwTableBox* pBox : pLine->GetTabBoxes() )
-        _FndContentBox(pBox, pPara );
+        FndContentBox(pBox, pPara );
 }
 
 // Find all Boxes with content in this Box
@@ -1054,7 +1054,7 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
     rBoxes.clear();
     for( SwTableBoxes::iterator it = pLine->GetTabBoxes().begin();
              it != pLine->GetTabBoxes().end(); ++it)
-        _FndContentBox(*it, &rBoxes );
+        FndContentBox(*it, &rBoxes );
     return rBoxes;
 }
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 0f578ff25222..ca223b0093c1 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star;
 
 // In order to set the Frame Formats for the Boxes, it's enough to look
 // up the current one in the array. If it's already there return the new one.
-struct _CpyTabFrame
+struct CpyTabFrame
 {
     union {
         SwTableBoxFormat *pFrameFormat;     // for CopyCol
@@ -86,14 +86,14 @@ struct _CpyTabFrame
     } Value;
     SwTableBoxFormat *pNewFrameFormat;
 
-    explicit _CpyTabFrame( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( nullptr )
+    explicit CpyTabFrame( SwTableBoxFormat* pAktFrameFormat ) : pNewFrameFormat( nullptr )
     {   Value.pFrameFormat = pAktFrameFormat; }
 
-    _CpyTabFrame& operator=( const _CpyTabFrame& );
+    CpyTabFrame& operator=( const CpyTabFrame& );
 
-    bool operator==( const _CpyTabFrame& rCpyTabFrame ) const
+    bool operator==( const CpyTabFrame& rCpyTabFrame ) const
         { return  (sal_uLong)Value.nSize == (sal_uLong)rCpyTabFrame.Value.nSize; }
-    bool operator<( const _CpyTabFrame& rCpyTabFrame ) const
+    bool operator<( const CpyTabFrame& rCpyTabFrame ) const
         { return  (sal_uLong)Value.nSize < (sal_uLong)rCpyTabFrame.Value.nSize; }
 };
 
@@ -167,7 +167,7 @@ typedef bool (*FN_lcl_SetBoxWidth)(SwTableLine*, CR_SetBoxWidth&, SwTwips, bool
     {                                                           \
         SwTwips nSize = GetFrameFormat()->GetFrameSize().GetWidth();   \
         for (size_t nTmp = 0; nTmp < m_aLines.size(); ++nTmp)   \
-            ::_CheckBoxWidth( *m_aLines[ nTmp ], nSize );         \
+            ::CheckBoxWidth( *m_aLines[ nTmp ], nSize );         \
     }
 
 #define CHECKTABLELAYOUT                                            \
@@ -239,21 +239,21 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
 
 typedef bool (*FN_lcl_SetLineHeight)(SwTableLine*, CR_SetLineHeight&, SwTwips, bool );
 
-_CpyTabFrame& _CpyTabFrame::operator=( const _CpyTabFrame& rCpyTabFrame )
+CpyTabFrame& CpyTabFrame::operator=( const CpyTabFrame& rCpyTabFrame )
 {
     pNewFrameFormat = rCpyTabFrame.pNewFrameFormat;
     Value = rCpyTabFrame.Value;
     return *this;
 }
 
-typedef o3tl::sorted_vector<_CpyTabFrame> _CpyTabFrames;
+typedef o3tl::sorted_vector<CpyTabFrame> CpyTabFrames;
 
-struct _CpyPara
+struct CpyPara
 {
     std::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths;
     SwDoc* pDoc;
     SwTableNode* pTableNd;
-    _CpyTabFrames& rTabFrameArr;
+    CpyTabFrames& rTabFrameArr;
     SwTableLine* pInsLine;
     SwTableBox* pInsBox;
     sal_uLong nOldSize, nNewSize;           // in order to correct the size attributes
@@ -263,7 +263,7 @@ struct _CpyPara
     sal_uInt8 nDelBorderFlag;
     bool bCpyContent;
 
-    _CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, _CpyTabFrames& rFrameArr )
+    CpyPara( SwTableNode* pNd, sal_uInt16 nCopies, CpyTabFrames& rFrameArr )
         : pDoc( pNd->GetDoc() ), pTableNd( pNd ), rTabFrameArr(rFrameArr),
         pInsLine(nullptr), pInsBox(nullptr), nOldSize(0), nNewSize(0),
         nMinLeft(ULONG_MAX), nMaxRight(0),
@@ -271,7 +271,7 @@ struct _CpyPara
         nLnIdx(0), nBoxIdx(0),
         nDelBorderFlag(0), bCpyContent( true )
         {}
-    _CpyPara( const _CpyPara& rPara, SwTableLine* pLine )
+    CpyPara( const CpyPara& rPara, SwTableLine* pLine )
         : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrameArr(rPara.rTabFrameArr), pInsLine(pLine), pInsBox(rPara.pInsBox),
         nOldSize(0), nNewSize(rPara.nNewSize), nMinLeft( rPara.nMinLeft ),
@@ -279,7 +279,7 @@ struct _CpyPara
         nLnIdx( rPara.nLnIdx), nBoxIdx( rPara.nBoxIdx ),
         nDelBorderFlag( rPara.nDelBorderFlag ), bCpyContent( rPara.bCpyContent )
         {}
-    _CpyPara( const _CpyPara& rPara, SwTableBox* pBox )
+    CpyPara( const CpyPara& rPara, SwTableBox* pBox )
         : pWidths( rPara.pWidths ), pDoc(rPara.pDoc), pTableNd(rPara.pTableNd),
         rTabFrameArr(rPara.rTabFrameArr), pInsLine(rPara.pInsLine), pInsBox(pBox),
         nOldSize(rPara.nOldSize), nNewSize(rPara.nNewSize),
@@ -289,18 +289,18 @@ struct _CpyPara
         {}
 };
 
-static void lcl_CopyRow(_FndLine & rFndLine, _CpyPara *const pCpyPara);
+static void lcl_CopyRow(FndLine_ & rFndLine, CpyPara *const pCpyPara);
 
-static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
+static void lcl_CopyCol( FndBox_ & rFndBox, CpyPara *const pCpyPara)
 {
     // Look up the Frame Format in the Frame Format Array
     SwTableBox* pBox = rFndBox.GetBox();
-    _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) );
+    CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pBox->GetFrameFormat()) );
 
     sal_uInt16 nFndPos;
     if( pCpyPara->nCpyCnt )
     {
-        _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame );
+        CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame );
         nFndPos = itFind - pCpyPara->rTabFrameArr.begin();
         if( itFind == pCpyPara->rTabFrameArr.end() || !(*itFind == aFindFrame) )
         {
@@ -308,7 +308,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
             SwTableBoxFormat* pNewFormat = static_cast<SwTableBoxFormat*>(pBox->ClaimFrameFormat());
 
             // Find the selected Boxes in the Line:
-            _FndLine const* pCmpLine = nullptr;
+            FndLine_ const* pCmpLine = nullptr;
             SwFormatFrameSize aFrameSz( pNewFormat->GetFrameSize() );
 
             bool bDiffCount = false;
@@ -359,7 +359,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
     }
     else
     {
-        _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame );
+        CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame );
         if( pCpyPara->nDelBorderFlag &&
             itFind != pCpyPara->rTabFrameArr.end() )
             aFindFrame = *itFind;
@@ -372,7 +372,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
         pBox = new SwTableBox( aFindFrame.pNewFrameFormat,
                     rFndBox.GetLines().size(), pCpyPara->pInsLine );
         pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
-        _CpyPara aPara( *pCpyPara, pBox );
+        CpyPara aPara( *pCpyPara, pBox );
         aPara.nDelBorderFlag &= 7;
 
         for (auto const& pFndLine : rFndBox.GetLines())
@@ -382,7 +382,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
     }
     else
     {
-        ::_InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine,
+        ::InsTableBox( pCpyPara->pDoc, pCpyPara->pTableNd, pCpyPara->pInsLine,
                     aFindFrame.pNewFrameFormat, pBox, pCpyPara->nInsPos++ );
 
         const FndBoxes_t& rFndBxs = rFndBox.GetUpper()->GetBoxes();
@@ -424,7 +424,7 @@ static void lcl_CopyCol( _FndBox & rFndBox, _CpyPara *const pCpyPara)
     }
 }
 
-static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
+static void lcl_CopyRow(FndLine_& rFndLine, CpyPara *const pCpyPara)
 {
     SwTableLine* pNewLine = new SwTableLine(
                             static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()),
@@ -440,7 +440,7 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine );
     }
 
-    _CpyPara aPara( *pCpyPara, pNewLine );
+    CpyPara aPara( *pCpyPara, pNewLine );
     for (auto const& it : rFndLine.GetBoxes())
     {
         lcl_CopyCol(*it, &aPara);
@@ -449,11 +449,11 @@ static void lcl_CopyRow(_FndLine& rFndLine, _CpyPara *const pCpyPara)
     pCpyPara->nDelBorderFlag &= 0xf8;
 }
 
-static void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, sal_uInt16 nCpyCnt,
+static void lcl_InsCol( FndLine_* pFndLn, CpyPara& rCpyPara, sal_uInt16 nCpyCnt,
                 bool bBehind )
 {
     // Bug 29124: Not only copy in the BaseLines. If possible, we go down as far as possible
-    _FndBox* pFBox;
+    FndBox_* pFBox;
     if( 1 == pFndLn->GetBoxes().size() &&
         !( pFBox = pFndLn->GetBoxes()[0].get() )->GetBox()->GetSttNd() )
     {
@@ -508,9 +508,9 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
     else
     {
         // Find all Boxes/Lines
-        _FndBox aFndBox( nullptr, nullptr );
+        FndBox_ aFndBox( nullptr, nullptr );
         {
-            _FndPara aPara( rBoxes, &aFndBox );
+            FndPara aPara( rBoxes, &aFndBox );
             ForEach_FndLineCopyCol( GetTabLines(), &aPara );
         }
         if( aFndBox.GetLines().empty() )
@@ -525,8 +525,8 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
         // TL_CHART2: nothing to be done since chart2 currently does not want to
         // get notified about new rows/cols.
 
-        _CpyTabFrames aTabFrameArr;
-        _CpyPara aCpyPara( pTableNd, nCnt, aTabFrameArr );
+        CpyTabFrames aTabFrameArr;
+        CpyPara aCpyPara( pTableNd, nCnt, aTabFrameArr );
 
         for (auto & rpLine : aFndBox.GetLines())
         {
@@ -554,7 +554,7 @@ bool SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
     return bRes;
 }
 
-bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
+bool SwTable::InsertRow_( SwDoc* pDoc, const SwSelBoxes& rBoxes,
                         sal_uInt16 nCnt, bool bBehind )
 {
     OSL_ENSURE( pDoc && !rBoxes.empty() && nCnt, "No valid Box List" );
@@ -563,9 +563,9 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
         return false;
 
      // Find all Boxes/Lines
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {
-        _FndPara aPara( rBoxes, &aFndBox );
+        FndPara aPara( rBoxes, &aFndBox );
         ForEach_FndLineCopyCol( GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
@@ -573,14 +573,14 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     SetHTMLTableLayout( nullptr );   // Delete HTML Layout
 
-    _FndBox* pFndBox = &aFndBox;
+    FndBox_* pFndBox = &aFndBox;
     {
-        _FndLine* pFndLine;
+        FndLine_* pFndLine;
         while( 1 == pFndBox->GetLines().size() &&
             1 == (pFndLine = pFndBox->GetLines()[0].get())->GetBoxes().size())
         {
             // Don't go down too far! One Line with Box needs to remain!
-            _FndBox *const pTmpBox = pFndLine->GetBoxes().front().get();
+            FndBox_ *const pTmpBox = pFndLine->GetBoxes().front().get();
             if( !pTmpBox->GetLines().empty() )
                 pFndBox = pTmpBox;
             else
@@ -601,8 +601,8 @@ bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes,
         // get notified about new rows/cols.
     }
 
-    _CpyTabFrames aTabFrameArr;
-    _CpyPara aCpyPara( pTableNd, 0, aTabFrameArr );
+    CpyTabFrames aTabFrameArr;
+    CpyPara aCpyPara( pTableNd, 0, aTabFrameArr );
 
     SwTableLine* pLine = pFndBox->GetLines()[ bBehind ?
                     pFndBox->GetLines().size()-1 : 0 ]->GetLine();
@@ -693,7 +693,7 @@ static void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
     }
 }
 
-void _DeleteBox( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo,
+void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo,
                 bool bCalcNewSize, const bool bCorrBorder,
                 SwShareBoxFormats* pShareFormats )
 {
@@ -993,7 +993,7 @@ bool SwTable::DeleteSel(
     SetHTMLTableLayout( nullptr );    // Delete HTML Layout
 
     // Find Lines for the Layout update
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     if ( bDelMakeFrames )
     {
         if( pMerged && !pMerged->empty() )
@@ -1031,7 +1031,7 @@ bool SwTable::DeleteSel(
             pPCD->DeleteBox( &pTableNd->GetTable(), *rBoxes[nIdx] );
 
         // ... then delete the boxes
-        _DeleteBox( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats );
+        DeleteBox_( *this, rBoxes[nIdx], pUndo, true, bCorrBorder, &aShareFormats );
     }
 
     // then clean up the structure of all Lines
@@ -1081,7 +1081,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
     }
 
     // Find Lines for the Layout update
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     aFndBox.SetTableLines( rBoxes, *this );
     aFndBox.DelFrames( *this );
 
@@ -1148,7 +1148,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
             }
             else
             {
-                ::_InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat,
+                ::InsTableBox( pDoc, pTableNd, pNewLine, pCpyBoxFrameFormat,
                                 pLastBox, 0 );
 
                 if( bChkBorder )
@@ -1169,7 +1169,7 @@ bool SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCn
                         SwNodeRange aRg( *pLastBox->GetSttNd(), +2, *pEndNd );
                         pLastBox = pNewLine->GetTabBoxes()[0];  // reset
                         SwNodeIndex aInsPos( *pLastBox->GetSttNd(), 1 );
-                        pDoc->GetNodes()._MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false);
+                        pDoc->GetNodes().MoveNodes(aRg, pDoc->GetNodes(), aInsPos, false);
                         pDoc->GetNodes().Delete( aInsPos ); // delete the empty one
                     }
                 }
@@ -1209,11 +1209,11 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
     ExpandSelection( aSelBoxes );
 
     // Find Lines for the Layout update
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     aFndBox.SetTableLines( aSelBoxes, *this );
     aFndBox.DelFrames( *this );
 
-    _CpyTabFrames aFrameArr;
+    CpyTabFrames aFrameArr;
     std::vector<SwTableBoxFormat*> aLastBoxArr;
     for (size_t n = 0; n < aSelBoxes.size(); ++n)
     {
@@ -1230,8 +1230,8 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 
         // Find the Frame Format in the Frame Format Array
         SwTableBoxFormat* pLastBoxFormat;
-        _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) );
-        _CpyTabFrames::const_iterator itFind = aFrameArr.lower_bound( aFindFrame );
+        CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(pSelBox->GetFrameFormat()) );
+        CpyTabFrames::const_iterator itFind = aFrameArr.lower_bound( aFindFrame );
         const size_t nFndPos = itFind - aFrameArr.begin();
         if( itFind == aFrameArr.end() || !(*itFind == aFindFrame) )
         {
@@ -1263,10 +1263,10 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 
         // Insert the Boxes at the Position
         for( sal_uInt16 i = 1; i < nCnt; ++i )
-            ::_InsTableBox( pDoc, pTableNd, pInsLine, aFindFrame.pNewFrameFormat,
+            ::InsTableBox( pDoc, pTableNd, pInsLine, aFindFrame.pNewFrameFormat,
                         pSelBox, nBoxPos + i ); // insert after
 
-        ::_InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat,
+        ::InsTableBox( pDoc, pTableNd, pInsLine, pLastBoxFormat,
                     pSelBox, nBoxPos + nCnt );  // insert after
 
         // Special treatment for the Border:
@@ -1282,7 +1282,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
             // Remove the Format from the "cache"
             for( auto i = aFrameArr.size(); i; )
             {
-                const _CpyTabFrame& rCTF = aFrameArr[ --i ];
+                const CpyTabFrame& rCTF = aFrameArr[ --i ];
                 if( rCTF.pNewFrameFormat == aFindFrame.pNewFrameFormat ||
                     rCTF.Value.pFrameFormat == aFindFrame.pNewFrameFormat )
                 {
@@ -1304,7 +1304,7 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 /*
  * >> MERGE <<
  * Algorithm:
- *    If we only have one Line in the _FndBox, take this Line and test
+ *    If we only have one Line in the FndBox_, take this Line and test
  *    the Box count:
  * If we have more than one Box, we merge on Box level, meaning
  *      the new Box will be as wide as the old ones.
@@ -1361,7 +1361,7 @@ static void lcl_CalcWidth( SwTableBox* pBox )
     pFormat->ResetFormatAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
 }
 
-struct _InsULPara
+struct InsULPara
 {
     SwTableNode* pTableNd;
     SwTableLine* pInsLine;
@@ -1371,7 +1371,7 @@ struct _InsULPara
 
     SwTableBox* pLeftBox;
 
-    _InsULPara( SwTableNode* pTNd,
+    InsULPara( SwTableNode* pTNd,
                 SwTableBox* pLeft,
                 SwTableLine* pLine=nullptr, SwTableBox* pBox=nullptr )
         : pTableNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
@@ -1386,9 +1386,9 @@ struct _InsULPara
         { bUL_LR = true;    bUL = false; if( pLine ) pInsLine = pLine; }
 };
 
-static void lcl_Merge_MoveLine(_FndLine & rFndLine, _InsULPara *const pULPara);
+static void lcl_Merge_MoveLine(FndLine_ & rFndLine, InsULPara *const pULPara);
 
-static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara)
+static void lcl_Merge_MoveBox(FndBox_ & rFndBox, InsULPara *const pULPara)
 {
     SwTableBoxes* pBoxes;
 
@@ -1430,7 +1430,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara)
         SwTableBox* pBox = new SwTableBox(
                 static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()),
                 0, pULPara->pInsLine );
-        _InsULPara aPara( *pULPara );
+        InsULPara aPara( *pULPara );
         aPara.pInsBox = pBox;
         for (FndLines_t::iterator it = rFndBox.GetLines().begin() + nStt;
              it != rFndBox.GetLines().begin() + nEnd; ++it )
@@ -1449,7 +1449,7 @@ static void lcl_Merge_MoveBox(_FndBox & rFndBox, _InsULPara *const pULPara)
     }
 }
 
-static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
+static void lcl_Merge_MoveLine(FndLine_& rFndLine, InsULPara *const pULPara)
 {
     SwTableLines* pLines;
 
@@ -1529,7 +1529,7 @@ static void lcl_Merge_MoveLine(_FndLine& rFndLine, _InsULPara *const pULPara)
 
     SwTableLine* pNewLine = new SwTableLine(
         static_cast<SwTableLineFormat*>(rFndLine.GetLine()->GetFrameFormat()), 0, pULPara->pInsBox );
-    _InsULPara aPara( *pULPara );       // copying
+    InsULPara aPara( *pULPara );       // copying
     aPara.pInsLine = pNewLine;
     FndBoxes_t & rLineBoxes = rFndLine.GetBoxes();
     for (FndBoxes_t::iterator it = rLineBoxes.begin() + nStt;
@@ -1559,9 +1559,9 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
         return false;
 
     // Find all Boxes/Lines
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {
-        _FndPara aPara( rBoxes, &aFndBox );
+        FndPara aPara( rBoxes, &aFndBox );
         ForEach_FndLineCopyCol( GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
@@ -1581,7 +1581,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     aFndBox.SetTableLines( *this );
     aFndBox.DelFrames( *this );
 
-    _FndBox* pFndBox = &aFndBox;
+    FndBox_* pFndBox = &aFndBox;
     while( 1 == pFndBox->GetLines().size() &&
             1 == pFndBox->GetLines().front()->GetBoxes().size() )
     {
@@ -1612,7 +1612,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
 
     // This contains all Lines that are above the selected Area,
     // thus they form a Upper/Lower Line
-    _InsULPara aPara( pTableNd, pLeftBox, pInsLine );
+    InsULPara aPara( pTableNd, pLeftBox, pInsLine );
 
     // Move the overlapping upper/lower Lines of the selected Area
     for (auto & it : pFndBox->GetLines().front()->GetBoxes())
@@ -1640,7 +1640,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     if( pLeftBox->GetTabLines().empty() )
-        _DeleteBox( *this, pLeftBox, nullptr, false, false );
+        DeleteBox_( *this, pLeftBox, nullptr, false, false );
     else
     {
         lcl_CalcWidth( pLeftBox );      // calculate the Box's width
@@ -1648,7 +1648,7 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
             pUndo->AddNewBox( pLeftBox->GetSttIdx() );
     }
     if( pRightBox->GetTabLines().empty() )
-        _DeleteBox( *this, pRightBox, nullptr, false, false );
+        DeleteBox_( *this, pRightBox, nullptr, false, false );
     else
     {
         lcl_CalcWidth( pRightBox );     // calculate the Box's width
@@ -1694,10 +1694,10 @@ static void lcl_CheckRowSpan( SwTable &rTable )
     }
 }
 
-static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
+static sal_uInt16 lcl_GetBoxOffset( const FndBox_& rBox )
 {
     // Find the first Box
-    const _FndBox* pFirstBox = &rBox;
+    const FndBox_* pFirstBox = &rBox;
     while (!pFirstBox->GetLines().empty())
     {
         pFirstBox = pFirstBox->GetLines().front()->GetBoxes().front().get();
@@ -1719,7 +1719,7 @@ static sal_uInt16 lcl_GetBoxOffset( const _FndBox& rBox )
     return nRet;
 }
 
-static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
+static sal_uInt16 lcl_GetLineWidth( const FndLine_& rLine )
 {
     sal_uInt16 nRet = 0;
     for( auto n = rLine.GetBoxes().size(); n; )
@@ -1730,7 +1730,7 @@ static sal_uInt16 lcl_GetLineWidth( const _FndLine& rLine )
     return nRet;
 }
 
-static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara)
+static void lcl_CalcNewWidths(const FndLines_t& rFndLines, CpyPara& rPara)
 {
     rPara.pWidths.reset();
     const size_t nLineCount = rFndLines.size();
@@ -1743,7 +1743,7 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara)
         for( size_t nLine = 0; nLine < nLineCount; ++nLine )
         {
             std::vector< sal_uLong > &rWidth = (*rPara.pWidths.get())[ nLine ];
-            const _FndLine *pFndLine = rFndLines[ nLine ].get();
+            const FndLine_ *pFndLine = rFndLines[ nLine ].get();
             if( pFndLine && pFndLine->GetBoxes().size() )
             {
                 const SwTableLine *pLine = pFndLine->GetLine();
@@ -1814,9 +1814,9 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara)
 }
 
 static void
-lcl_CopyLineToDoc(_FndLine const& rpFndLn, _CpyPara *const pCpyPara);
+lcl_CopyLineToDoc(FndLine_ const& rpFndLn, CpyPara *const pCpyPara);
 
-static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
+static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara)
 {
     // Calculation of new size
     sal_uLong nRealSize;
@@ -1851,11 +1851,11 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
     do
     {
         // Find the Frame Format in the list of all Frame Formats
-        _CpyTabFrame aFindFrame(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()));
+        CpyTabFrame aFindFrame(static_cast<SwTableBoxFormat*>(rFndBox.GetBox()->GetFrameFormat()));
 
         SwFormatFrameSize aFrameSz;
-        _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame );
-        const _CpyTabFrames::size_type nFndPos = itFind - pCpyPara->rTabFrameArr.begin();
+        CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.lower_bound( aFindFrame );
+        const CpyTabFrames::size_type nFndPos = itFind - pCpyPara->rTabFrameArr.begin();
         if( itFind == pCpyPara->rTabFrameArr.end() || !(*itFind == aFindFrame) ||
             ( aFrameSz = ( aFindFrame = pCpyPara->rTabFrameArr[ nFndPos ]).pNewFrameFormat->
                 GetFrameSize()).GetWidth() != (SwTwips)nSize )
@@ -1876,7 +1876,7 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
             pBox = new SwTableBox( aFindFrame.pNewFrameFormat,
                         rFndBox.GetLines().size(), pCpyPara->pInsLine );
             pCpyPara->pInsLine->GetTabBoxes().insert( pCpyPara->pInsLine->GetTabBoxes().begin() + pCpyPara->nInsPos++, pBox );
-            _CpyPara aPara( *pCpyPara, pBox );
+            CpyPara aPara( *pCpyPara, pBox );
             aPara.nNewSize = nSize;     // get the size
             for (auto const& rpFndLine : rFndBox.GetLines())
             {
@@ -1946,11 +1946,11 @@ static void lcl_CopyBoxToDoc(_FndBox const& rFndBox, _CpyPara *const pCpyPara)
 }
 
 static void
-lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
+lcl_CopyLineToDoc(const FndLine_& rFndLine, CpyPara *const pCpyPara)
 {
     // Find the Frame Format in the list of all Frame Formats
-    _CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) );
-    _CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame );
+    CpyTabFrame aFindFrame( static_cast<SwTableBoxFormat*>(rFndLine.GetLine()->GetFrameFormat()) );
+    CpyTabFrames::const_iterator itFind = pCpyPara->rTabFrameArr.find( aFindFrame );
     if( itFind == pCpyPara->rTabFrameArr.end() )
     {
         // It doesn't exist yet, so copy it
@@ -1974,7 +1974,7 @@ lcl_CopyLineToDoc(const _FndLine& rFndLine, _CpyPara *const pCpyPara)
         rLines.insert( rLines.begin() + pCpyPara->nInsPos++, pNewLine);
     }
 
-    _CpyPara aPara( *pCpyPara, pNewLine );
+    CpyPara aPara( *pCpyPara, pNewLine );
 
     if( pCpyPara->pTableNd->GetTable().IsNewModel() )
     {
@@ -2017,9 +2017,9 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd )
     pBox = GetTableBox( pBox->GetSttNd()->StartOfSectionNode()->GetIndex() + 1 );
     SelLineFromBox( pBox, aSelBoxes );
 
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {
-        _FndPara aPara( aSelBoxes, &aFndBox );
+        FndPara aPara( aSelBoxes, &aFndBox );
         ForEach_FndLineCopyCol( GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
@@ -2032,8 +2032,8 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd )
         GetFrameFormat()->GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
-    _CpyTabFrames aCpyFormat;
-    _CpyPara aPara( &rTableNd, 1, aCpyFormat );
+    CpyTabFrames aCpyFormat;
+    CpyPara aPara( &rTableNd, 1, aCpyFormat );
     aPara.nNewSize = aPara.nOldSize = rTableNd.GetTable().GetFrameFormat()->GetFrameSize().GetWidth();
     // Copy
     if( IsNewModel() )
@@ -2061,9 +2061,9 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
                         bool bCpyName ) const
 {
     // Find all Boxes/Lines
-    _FndBox aFndBox( nullptr, nullptr );
+    FndBox_ aFndBox( nullptr, nullptr );
     {
-        _FndPara aPara( rSelBoxes, &aFndBox );
+        FndPara aPara( rSelBoxes, &aFndBox );
         ForEach_FndLineCopyCol( (SwTableLines&)GetTabLines(), &aPara );
     }
     if( aFndBox.GetLines().empty() )
@@ -2127,8 +2127,8 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
     if( bCpyName )
         pNewTable->GetFrameFormat()->SetName( GetFrameFormat()->GetName() );
 
-    _CpyTabFrames aCpyFormat;
-    _CpyPara aPara( pTableNd, 1, aCpyFormat );
+    CpyTabFrames aCpyFormat;
+    CpyPara aPara( pTableNd, 1, aCpyFormat );
     aPara.nNewSize = aPara.nOldSize = GetFrameFormat()->GetFrameSize().GetWidth();
 
     if( IsNewModel() )
@@ -2141,7 +2141,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
 
     // Set the "right" margin above/below
     {
-        _FndLine* pFndLn = aFndBox.GetLines().front().get();
+        FndLine_* pFndLn = aFndBox.GetLines().front().get();
         SwTableLine* pLn = pFndLn->GetLine();
         const SwTableLine* pTmp = pLn;
         sal_uInt16 nLnPos = GetTabLines().GetPos( pTmp );
@@ -2193,7 +2193,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
     }
 
     // We need to delete the initial Box
-    _DeleteBox( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0],
+    DeleteBox_( *pNewTable, pNewTable->GetTabLines().back()->GetTabBoxes()[0],
                 nullptr, false, false );
 
     if( pNewTable->IsNewModel() )
@@ -2644,7 +2644,7 @@ static bool lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
                     if( !rParam.bLeft && 3 != nCmp )
                         ++n;
 
-                    ::_InsTableBox( pFormat->GetDoc(), rParam.pTableNd,
+                    ::InsTableBox( pFormat->GetDoc(), rParam.pTableNd,
                                         pLine, pFormat, pBox, n );
 
                     SwTableBox* pNewBox = rBoxes[ n ];
@@ -2840,7 +2840,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
 //  POS_EQUAL,              // Box and start/end are the same
 //  POS_OVERLAP_BEFORE,     // Box overlapps the start
 //  POS_OVERLAP_BEHIND      // Box overlapps the end
-SwComparePosition _CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd,
+SwComparePosition CheckBoxInRange( sal_uInt16 nStt, sal_uInt16 nEnd,
                                     sal_uInt16 nBoxStt, sal_uInt16 nBoxEnd )
 {
     // Still treat COLFUZZY!
@@ -2988,7 +2988,7 @@ static bool lcl_DeleteBox_Recursive( CR_SetBoxWidth& rParam, SwTableBox& rBox,
             }
         }
         else
-            ::_DeleteBox( rParam.pTableNd->GetTable(), &rBox,
+            ::DeleteBox_( rParam.pTableNd->GetTable(), &rBox,
                             rParam.pUndo, false, true, &rParam.aShareFormats );
     }
     else
@@ -3047,7 +3047,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam,
         bool bDelBox = false, bChgLowers = false;
 
         // Test the Box width and react accordingly
-        SwComparePosition ePosType = ::_CheckBoxInRange(
+        SwComparePosition ePosType = ::CheckBoxInRange(
                             nBoxChkStt, nBoxChkEnd,
                             sal_uInt16(rParam.bLeft ? nDist - nWidth : nDist),
                             sal_uInt16(rParam.bLeft ? nDist : nDist + nWidth));
@@ -3312,7 +3312,7 @@ static void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
 }
 
 #ifdef DBG_UTIL
-void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
+void CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 {
     const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
 
@@ -3325,7 +3325,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
         nAktSize += nBoxW;
 
         for( auto pLn : pBox->GetTabLines() )
-            _CheckBoxWidth( *pLn, nBoxW );
+            CheckBoxWidth( *pLn, nBoxW );
     }
 
     if (sal::static_int_cast< unsigned long >(std::abs(nAktSize - nSize)) >
@@ -3336,7 +3336,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
 }
 #endif
 
-static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
+static FndBox_* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst, SwTwips nDistStt )
 {
     // Find all Boxes/Lines
@@ -3360,12 +3360,12 @@ static _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo,
         return nullptr;
     }
 
-    _FndBox* pFndBox = new _FndBox( nullptr, nullptr );
+    FndBox_* pFndBox = new FndBox_( nullptr, nullptr );
     if( rParam.bBigger )
         pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
-        _FndPara aPara(rParam.m_Boxes, pFndBox);
+        FndPara aPara(rParam.m_Boxes, pFndBox);
         ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes" );
         pFndBox->SetTableLines( rTable );
@@ -3392,7 +3392,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
     const SwFormatFrameSize& rSz = GetFrameFormat()->GetFrameSize();
     const SvxLRSpaceItem& rLR = GetFrameFormat()->GetLRSpace();
 
-    std::unique_ptr<_FndBox> xFndBox;                // for insertion/deletion
+    std::unique_ptr<FndBox_> xFndBox;                // for insertion/deletion
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
@@ -3874,7 +3874,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
     return bRet;
 }
 
-static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
+static FndBox_* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
                                 SwTableSortBoxes& rTmpLst )
 {
     // Find all Boxes/Lines
@@ -3889,12 +3889,12 @@ static _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
         return nullptr;
     }
 
-    _FndBox* pFndBox = new _FndBox( nullptr, nullptr );
+    FndBox_* pFndBox = new FndBox_( nullptr, nullptr );
     if( !rParam.bBigger )
         pFndBox->SetTableLines( rParam.m_Boxes, rTable );
     else
     {
-        _FndPara aPara(rParam.m_Boxes, pFndBox);
+        FndPara aPara(rParam.m_Boxes, pFndBox);
         ForEach_FndLineCopyCol( rTable.GetTabLines(), &aPara );
         OSL_ENSURE( pFndBox->GetLines().size(), "Where are the Boxes?" );
         pFndBox->SetTableLines( rTable );
@@ -4036,7 +4036,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
             }
             for (size_t n = rBoxes.size(); n; )
             {
-                ::_DeleteBox( rParam.pTableNd->GetTable(),
+                ::DeleteBox_( rParam.pTableNd->GetTable(),
                                     rBoxes[ --n ], rParam.pUndo, false,
                                     false, &rParam.aShareFormats );
             }
@@ -4072,7 +4072,7 @@ static bool lcl_InsDelSelLine( SwTableLine* pLine, CR_SetLineHeight& rParam,
                     while( !pOld->GetSttNd() )
                         pOld = pOld->GetTabLines()[ 0 ]->GetTabBoxes()[ 0 ];
                 }
-                ::_InsTableBox( pDoc, rParam.pTableNd, pNewLine,
+                ::InsTableBox( pDoc, rParam.pTableNd, pNewLine,
                                     static_cast<SwTableBoxFormat*>(pOld->GetFrameFormat()), pOld, n );
 
                 // Special treatment for the border:
@@ -4127,7 +4127,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
     while( pBaseLine->GetUpper() )
         pBaseLine = pBaseLine->GetUpper()->GetUpper();
 
-    std::unique_ptr<_FndBox> xFndBox;                // for insertion/deletion
+    std::unique_ptr<FndBox_> xFndBox;                // for insertion/deletion
     SwTableSortBoxes aTmpLst;       // for Undo
     bool bBigger,
         bRet = false,
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 0a66017f86f2..43908dab32da 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -610,16 +610,16 @@ void SwTextBoxHelper::resetLink(SwFrameFormat* pShape, std::map<const SwFrameFor
     }
 }
 
-void SwTextBoxHelper::restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
+void SwTextBoxHelper::restoreLinks(std::set<ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rOldContent)
 {
     std::size_t i = 0;
-    for (std::set<_ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i)
+    for (std::set<ZSortFly>::iterator aSetIt = rOld.begin(); aSetIt != rOld.end(); ++aSetIt, ++i)
     {
         SavedLink::iterator aTextBoxIt = rSavedLinks.find(aSetIt->GetFormat());
         if (aTextBoxIt != rSavedLinks.end())
         {
             std::size_t j = 0;
-            for (std::set<_ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j)
+            for (std::set<ZSortFly>::iterator aSetJt = rOld.begin(); aSetJt != rOld.end(); ++aSetJt, ++j)
             {
                 if (aSetJt->GetFormat() == aTextBoxIt->second)
                     rNew[i]->SetFormatAttr(rNew[j]->GetContent());